From 7b39e6d224f817db9ada5ae3a921c76a96ce972e Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Fri, 7 Aug 2020 20:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=A8=A1=E6=9D=BF=E6=94=B9?= =?UTF-8?q?=E6=88=90=E7=BB=A7=E6=89=BF=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Views/audit/list.volt | 132 +++--- app/Http/Admin/Views/audit/search.volt | 109 ++--- app/Http/Admin/Views/audit/show.volt | 28 +- app/Http/Admin/Views/category/add.volt | 83 ++-- app/Http/Admin/Views/category/edit.volt | 60 +-- app/Http/Admin/Views/category/list.volt | 126 +++--- app/Http/Admin/Views/chapter/add_chapter.volt | 49 +-- app/Http/Admin/Views/chapter/add_lesson.volt | 83 ++-- .../Admin/Views/chapter/edit_chapter.volt | 58 +-- app/Http/Admin/Views/chapter/edit_lesson.volt | 114 ++++-- .../Views/chapter/edit_lesson_basic.volt | 6 - .../Admin/Views/chapter/edit_lesson_live.volt | 146 +++---- .../Admin/Views/chapter/edit_lesson_read.volt | 62 +-- .../Views/chapter/edit_lesson_read2.volt | 17 - .../Admin/Views/chapter/edit_lesson_vod.volt | 135 ++++--- app/Http/Admin/Views/chapter/lessons.volt | 94 +++-- .../Admin/Views/chapter/lessons_live.volt | 110 ++--- .../Admin/Views/chapter/lessons_read.volt | 94 +++-- app/Http/Admin/Views/chapter/lessons_vod.volt | 126 +++--- app/Http/Admin/Views/course/add.volt | 98 ++--- app/Http/Admin/Views/course/chapters.volt | 104 ++--- app/Http/Admin/Views/course/edit.volt | 127 ++++-- app/Http/Admin/Views/course/edit_basic.volt | 61 --- app/Http/Admin/Views/course/edit_desc.volt | 55 ++- app/Http/Admin/Views/course/edit_related.volt | 8 - app/Http/Admin/Views/course/edit_sale.volt | 34 +- app/Http/Admin/Views/course/list.volt | 218 +++++----- app/Http/Admin/Views/course/search.volt | 194 ++++----- app/Http/Admin/Views/group/add.volt | 60 +-- app/Http/Admin/Views/group/edit.volt | 94 ++--- app/Http/Admin/Views/group/list.volt | 128 +++--- app/Http/Admin/Views/group/search.volt | 108 +++-- app/Http/Admin/Views/help/add.volt | 73 ++-- app/Http/Admin/Views/help/edit.volt | 73 ++-- app/Http/Admin/Views/help/list.volt | 106 ++--- app/Http/Admin/Views/index/index.volt | 11 +- app/Http/Admin/Views/index/main.volt | 5 + app/Http/Admin/Views/nav/add.volt | 120 +++--- app/Http/Admin/Views/nav/edit.volt | 97 +++-- app/Http/Admin/Views/nav/list.volt | 160 ++++---- app/Http/Admin/Views/order/list.volt | 102 ++--- app/Http/Admin/Views/order/search.volt | 124 +++--- app/Http/Admin/Views/order/show.volt | 137 ++++--- .../Admin/Views/order/status_history.volt | 28 +- app/Http/Admin/Views/package/add.volt | 47 +-- app/Http/Admin/Views/package/edit.volt | 152 +++---- app/Http/Admin/Views/package/guiding.volt | 77 ++-- app/Http/Admin/Views/package/list.volt | 108 ++--- app/Http/Admin/Views/package/search.volt | 73 ++-- app/Http/Admin/Views/page/add.volt | 60 ++- app/Http/Admin/Views/page/edit.volt | 63 ++- app/Http/Admin/Views/page/list.volt | 102 ++--- .../Admin/Views/partials/avatar_uploader.volt | 49 --- .../Admin/Views/partials/clipboard_tips.volt | 16 - .../Admin/Views/partials/cover_uploader.volt | 29 -- app/Http/Admin/Views/partials/ip2region.volt | 22 - app/Http/Admin/Views/partials/layedit.volt | 19 - .../Admin/Views/partials/media_preview.volt | 24 -- .../Admin/Views/partials/media_uploader.volt | 64 --- app/Http/Admin/Views/public/ip2region.volt | 34 +- app/Http/Admin/Views/public/login.volt | 109 ++--- app/Http/Admin/Views/refund/list.volt | 102 ++--- app/Http/Admin/Views/refund/search.volt | 107 ++--- app/Http/Admin/Views/refund/show.volt | 142 ++++--- .../Admin/Views/refund/status_history.volt | 28 +- app/Http/Admin/Views/review/edit.volt | 90 +++-- app/Http/Admin/Views/review/list.volt | 116 +++--- app/Http/Admin/Views/review/search.volt | 84 ++-- app/Http/Admin/Views/role/add.volt | 47 +-- app/Http/Admin/Views/role/edit.volt | 90 ++--- app/Http/Admin/Views/role/list.volt | 114 +++--- app/Http/Admin/Views/setting/captcha.volt | 165 ++++---- app/Http/Admin/Views/setting/live.volt | 94 ++++- app/Http/Admin/Views/setting/live_pull.volt | 65 +-- app/Http/Admin/Views/setting/live_push.volt | 48 +-- .../Admin/Views/setting/live_push_test.volt | 88 ++-- app/Http/Admin/Views/setting/mailer.volt | 191 +++++---- app/Http/Admin/Views/setting/pay.volt | 67 +++- app/Http/Admin/Views/setting/pay_alipay.volt | 39 +- .../Admin/Views/setting/pay_alipay_test.volt | 103 ++--- app/Http/Admin/Views/setting/pay_wxpay.volt | 40 +- .../Admin/Views/setting/pay_wxpay_test.volt | 101 +++-- app/Http/Admin/Views/setting/secret.volt | 58 +-- app/Http/Admin/Views/setting/site.volt | 130 +++--- app/Http/Admin/Views/setting/smser.volt | 193 +++++---- app/Http/Admin/Views/setting/storage.volt | 138 +++---- app/Http/Admin/Views/setting/vip.volt | 42 +- app/Http/Admin/Views/setting/vod.volt | 376 +++++++++--------- app/Http/Admin/Views/slide/add.volt | 100 ++--- app/Http/Admin/Views/slide/edit.volt | 173 ++++---- app/Http/Admin/Views/slide/list.volt | 118 +++--- app/Http/Admin/Views/student/add.volt | 80 ++-- app/Http/Admin/Views/student/edit.volt | 80 ++-- app/Http/Admin/Views/student/learning.volt | 81 ++-- app/Http/Admin/Views/student/list.volt | 180 +++++---- app/Http/Admin/Views/student/search.volt | 64 +-- app/Http/Admin/Views/templates/layer.volt | 24 ++ .../Views/{index.volt => templates/main.volt} | 18 +- app/Http/Admin/Views/topic/add.volt | 47 +-- app/Http/Admin/Views/topic/edit.volt | 75 ++-- app/Http/Admin/Views/topic/list.volt | 108 ++--- app/Http/Admin/Views/trade/list.volt | 108 ++--- app/Http/Admin/Views/trade/search.volt | 118 +++--- app/Http/Admin/Views/trade/show.volt | 145 ++++--- .../Admin/Views/trade/status_history.volt | 28 +- app/Http/Admin/Views/trade/trade_info.volt | 2 +- app/Http/Admin/Views/user/add.volt | 81 ++-- app/Http/Admin/Views/user/edit.volt | 278 +++++++------ app/Http/Admin/Views/user/list.volt | 174 ++++---- app/Http/Admin/Views/user/search.volt | 101 +++-- public/static/admin/js/avatar.upload.js | 45 +++ public/static/admin/js/copy.js | 10 + public/static/admin/js/cover.upload.js | 25 ++ public/static/admin/js/ip2region.js | 18 + public/static/admin/js/media.preview.js | 23 ++ public/static/admin/js/media.upload.js | 58 +++ public/static/admin/js/vditor.js | 48 +++ 117 files changed, 5235 insertions(+), 5038 deletions(-) delete mode 100644 app/Http/Admin/Views/chapter/edit_lesson_read2.volt delete mode 100644 app/Http/Admin/Views/partials/avatar_uploader.volt delete mode 100644 app/Http/Admin/Views/partials/clipboard_tips.volt delete mode 100644 app/Http/Admin/Views/partials/cover_uploader.volt delete mode 100644 app/Http/Admin/Views/partials/ip2region.volt delete mode 100644 app/Http/Admin/Views/partials/layedit.volt delete mode 100644 app/Http/Admin/Views/partials/media_preview.volt delete mode 100644 app/Http/Admin/Views/partials/media_uploader.volt create mode 100644 app/Http/Admin/Views/templates/layer.volt rename app/Http/Admin/Views/{index.volt => templates/main.volt} (51%) create mode 100644 public/static/admin/js/avatar.upload.js create mode 100644 public/static/admin/js/copy.js create mode 100644 public/static/admin/js/cover.upload.js create mode 100644 public/static/admin/js/ip2region.js create mode 100644 public/static/admin/js/media.preview.js create mode 100644 public/static/admin/js/media.upload.js create mode 100644 public/static/admin/js/vditor.js diff --git a/app/Http/Admin/Views/audit/list.volt b/app/Http/Admin/Views/audit/list.volt index 83b138f7..330e7d0a 100644 --- a/app/Http/Admin/Views/audit/list.volt +++ b/app/Http/Admin/Views/audit/list.volt @@ -1,75 +1,89 @@ -
-
+{% extends 'templates/main.volt' %} + +{% block content %} + +
+
操作记录 +
+
+ + 搜索记录 + +
-
- - 搜索记录 - -
-
- - - - - - - - - - - - - - - - - - - - - - - {% for item in pager.items %} +
用户编号用户名称用户IP请求路由请求路径请求时间请求内容
+ + + + + + + + + + - - - - - - - + + + + + + + - {% endfor %} - -
{{ item.user_id }}{{ item.user_name }}{{ item.user_ip }}{{ item.req_route }}{{ item.req_path }}{{ date('Y-m-d H:i:s',item.create_time) }} - - 用户编号用户名称用户IP请求路由请求路径请求时间请求内容
+ + + {% for item in pager.items %} + + {{ item.user_id }} + {{ item.user_name }} + {{ item.user_ip }} + {{ item.req_route }} + {{ item.req_path }} + {{ date('Y-m-d H:i:s',item.create_time) }} + + + + + {% endfor %} + + -{{ partial('partials/pager') }} -{{ partial('partials/ip2region') }} + {{ partial('partials/pager') }} - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/app/Http/Admin/Views/audit/search.volt b/app/Http/Admin/Views/audit/search.volt index a27fa54d..2167810e 100644 --- a/app/Http/Admin/Views/audit/search.volt +++ b/app/Http/Admin/Views/audit/search.volt @@ -1,72 +1,73 @@ -
+{% extends 'templates/main.volt' %} -
- 搜索记录 -
+{% block content %} -
- -
- + +
+ 搜索记录 +
+
+ +
+ +
-
- -
- -
- +
+ +
+ +
-
- -
- -
- +
+ +
+ +
-
- -
- -
- +
+ +
+ +
-
- -
- -
- +
+ +
+ +
+
-
+
+ +
-
-
-
- +
+ +
+ + +
-
+ -
- -
- - -
-
+{% endblock %} - +{% block inline_js %} - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/app/Http/Admin/Views/audit/show.volt b/app/Http/Admin/Views/audit/show.volt index ebdf1603..aac57fe1 100644 --- a/app/Http/Admin/Views/audit/show.volt +++ b/app/Http/Admin/Views/audit/show.volt @@ -1,12 +1,22 @@ -

+{% extends 'templates/main.volt' %}
 
-
+{% endblock %}
+
+{% block inline_js %}
+
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/category/add.volt b/app/Http/Admin/Views/category/add.volt
index 425c0eb4..75fc43a9 100644
--- a/app/Http/Admin/Views/category/add.volt
+++ b/app/Http/Admin/Views/category/add.volt
@@ -1,52 +1,51 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加分类
-    

+{% block content %}
 
-    {% if parent_id > 0 %}
+    
+        

+            添加分类
+        

+        {% if parent_id > 0 %}
+            

+                
+                

+                    
+                

+            

+        {% endif %}
         

-            
+            
             

-                
+                
             

         

-    {% endif %}
-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+                
+            

         

-    

+    
 
-    

-        
-        

-            
-            
-            
-        

-    

-
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/category/edit.volt b/app/Http/Admin/Views/category/edit.volt
index d023e176..0d12f1eb 100644
--- a/app/Http/Admin/Views/category/edit.volt
+++ b/app/Http/Admin/Views/category/edit.volt
@@ -1,37 +1,37 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑分类
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            编辑分类
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/category/list.volt b/app/Http/Admin/Views/category/list.volt
index 48f66a7b..921ec6c8 100644
--- a/app/Http/Admin/Views/category/list.volt
+++ b/app/Http/Admin/Views/category/list.volt
@@ -1,5 +1,9 @@
-

-    

+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    

+        

         
             {% if parent.id > 0 %}
                 
@@ -9,65 +13,67 @@
             {% endif %}
             分类管理
         
+        

+        

+            
+                添加分类
+            
+        

     

-    

-        
-            添加分类
-        
-    

-

 
-
-    -        -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in categories %}
+    










编号名称层级节点数课程数排序发布操作

+        +            +            +            +            +            +            +            +            +        
+        
-            
-            {% if item.level < 2 %}
-                
-            {% else %}
-                
-            {% endif %}
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-










         
{{ item.id }}{{ item.name }}{{ item.name }}{{ item.level }}{{ item.child_count }}{{ item.course_count }}
-                

-                    
-                    
-                

-            		编号名称层级节点数课程数排序发布操作
         

\ No newline at end of file
+        
+        
+        {% for item in categories %}
+            
+                {{ item.id }}
+                {% if item.level < 2 %}
+                    {{ item.name }}
+                {% else %}
+                    {{ item.name }}
+                {% endif %}
+                {{ item.level }}
+                {{ item.child_count }}
+                {{ item.course_count }}
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/add_chapter.volt b/app/Http/Admin/Views/chapter/add_chapter.volt
index 89884c6e..5a62448e 100644
--- a/app/Http/Admin/Views/chapter/add_chapter.volt
+++ b/app/Http/Admin/Views/chapter/add_chapter.volt
@@ -1,30 +1,31 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加章节
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            添加章节
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
-            
+        

+            
+            

+                
+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/add_lesson.volt b/app/Http/Admin/Views/chapter/add_lesson.volt
index a4e23008..67ac4b57 100644
--- a/app/Http/Admin/Views/chapter/add_lesson.volt
+++ b/app/Http/Admin/Views/chapter/add_lesson.volt
@@ -1,50 +1,49 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加课时
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            添加课时
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
-            
+        

+            
+            

+                
+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_chapter.volt b/app/Http/Admin/Views/chapter/edit_chapter.volt
index a684889c..4147d030 100644
--- a/app/Http/Admin/Views/chapter/edit_chapter.volt
+++ b/app/Http/Admin/Views/chapter/edit_chapter.volt
@@ -1,36 +1,36 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑章节
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            编辑章节
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_lesson.volt b/app/Http/Admin/Views/chapter/edit_lesson.volt
index 1c1e1448..894ec371 100644
--- a/app/Http/Admin/Views/chapter/edit_lesson.volt
+++ b/app/Http/Admin/Views/chapter/edit_lesson.volt
@@ -1,37 +1,91 @@
-{%- macro content_title(model) %}
-    {% if model == 'vod' %}
-        点播信息
-    {% elseif model == 'live' %}
-        直播信息
-    {% elseif model == 'read' %}
-        文章信息
-    {% endif %}
-{%- endmacro %}
+{% extends 'templates/main.volt' %}
 
-

-    编辑课时
-

+{% block content %}
 
-

+    {%- macro content_title(model) %}
+        {% if model == 'vod' %}
+            点播信息
+        {% elseif model == 'live' %}
+            直播信息
+        {% elseif model == 'read' %}
+            文章信息
+        {% endif %}
+    {%- endmacro %}
 
-    
    
-        
  • 基本信息
    • 
-        
  • {{ content_title(course.model) }}
    • 
-    

+    

+        编辑课时
+    

 
-    

-        

-            {{ partial('chapter/edit_lesson_basic') }}
-        

-        

-            {% if course.model == 'vod' %}
-                {{ partial('chapter/edit_lesson_vod') }}
-            {% elseif course.model == 'live' %}
-                {{ partial('chapter/edit_lesson_live') }}
-            {% elseif course.model == 'read' %}
-                {{ partial('chapter/edit_lesson_read') }}
-            {% endif %}
+    

+        
    
+            
  • 基本信息
    • 
+            
  • {{ content_title(course.model) }}
    • 
+        

+        

+            

+                {{ partial('chapter/edit_lesson_basic') }}
+            

+            

+                {% if course.model == 'vod' %}
+                    {{ partial('chapter/edit_lesson_vod') }}
+                {% elseif course.model == 'live' %}
+                    {{ partial('chapter/edit_lesson_live') }}
+                {% elseif course.model == 'read' %}
+                    {{ partial('chapter/edit_lesson_read') }}
+                {% endif %}
+            

         

     

 
-

\ No newline at end of file
+{% endblock %}
+
+{% block link_css %}
+
+    
+
+{% endblock %}
+
+{% block include_js %}
+
+    
+
+    {{ js_include('admin/js/vditor.js') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_basic.volt b/app/Http/Admin/Views/chapter/edit_lesson_basic.volt
index a8ccd8d3..7905606f 100644
--- a/app/Http/Admin/Views/chapter/edit_lesson_basic.volt
+++ b/app/Http/Admin/Views/chapter/edit_lesson_basic.volt
@@ -1,26 +1,22 @@
 

-
     

         
         

             
         

     

-
     

         
         

             
         

     

-
     

         
         

             
         

     

-
     

         
         

@@ -28,7 +24,6 @@
             
         

     

-
     

         
         

@@ -36,5 +31,4 @@
             
         

     

-
 

\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_live.volt b/app/Http/Admin/Views/chapter/edit_lesson_live.volt
index 9d8ebadc..84f499e2 100644
--- a/app/Http/Admin/Views/chapter/edit_lesson_live.volt
+++ b/app/Http/Admin/Views/chapter/edit_lesson_live.volt
@@ -1,89 +1,91 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        
-        

-            {% if live.start_time > 0 %}
-                
-            {% else %}
-                
-            {% endif %}
+{% block content %}
+
+    
+        

+            
+            

+                {% if live.start_time > 0 %}
+                    
+                {% else %}
+                    
+                {% endif %}
+            

         

-    

-
-    

-        
-        

-            {% if live.end_time > 0 %}
-                
-            {% else %}
-                
-            {% endif %}
+        

+            
+            

+                {% if live.end_time > 0 %}
+                    
+                {% else %}
+                    
+                {% endif %}
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
-
-

-
-    

-        推流测试
-    

-
-    

-        
-        

-            
+    
+        

+            推流测试
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
+{% endblock %}
 
-
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_read.volt b/app/Http/Admin/Views/chapter/edit_lesson_read.volt
index ab75b36a..cb7d0316 100644
--- a/app/Http/Admin/Views/chapter/edit_lesson_read.volt
+++ b/app/Http/Admin/Views/chapter/edit_lesson_read.volt
@@ -1,70 +1,14 @@
-

+

 
 

-
     

-        
+        
     

-
     

         
         

             
             
-            
         

     

-
-

-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_read2.volt b/app/Http/Admin/Views/chapter/edit_lesson_read2.volt
deleted file mode 100644
index 74cf5122..00000000
--- a/app/Http/Admin/Views/chapter/edit_lesson_read2.volt
+++ /dev/null
@@ -1,17 +0,0 @@
-

-
-    

-        
-    

-
-    

-        
-        

-            
-            
-        

-    

-
-

-
-{{ partial('partials/layedit') }}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt
index 1d528c97..193f1ad5 100644
--- a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt
+++ b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt
@@ -1,74 +1,81 @@
-{% if play_urls %}
-    

-        视频信息
-    

-    
-        
-            
-            
-            
-            
-            
-            
-        
-        {% for item in play_urls %}
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% if play_urls %}
+        

+            视频信息
+        

+        
格式时长分辨率码率大小操作

-                
-                
-                
-                
-                
-                
+                
+                
+                
+                
+                
+                
-        {% endfor %}
-    

             
{{ item.format }}{{ item.duration|duration }}{{ item.width }} x {{ item.height }}{{ item.rate }}kbps{{ item.size }}M
-                    预览
-                    复制
-                格式时长分辨率码率大小操作
             

-    

-{% endif %}
+            {% for item in play_urls %}
+                
+                    {{ item.format }}
+                    {{ item.duration|duration }}
+                    {{ item.width }} x {{ item.height }}
+                    {{ item.rate }}kbps
+                    {{ item.size }}M
+                    
+                        预览
+                        复制
+                    
+                
+            {% endfor %}
+        
+        

+    {% endif %}
 
-

-    上传视频
-

+    

+        上传视频
+    

 
-

-
-    

-        
-        

-            选择视频
-            
-        

-    

-
-    

-        
-        

-            

-                

+    
+        

+            
+            

+                选择视频
+                
             

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                

+                    

+                

+            

         

-    

-
-    

-        
-        

-            
-            
-            
+        

+            
+            

+                
+            

         

-    

+        

+            
+            

+                
+                
+                
+            

+        

+    
 
-
+{% endblock %}
 
-{{ partial('partials/media_uploader') }}
-{{ partial('partials/media_preview') }}
-{{ partial('partials/clipboard_tips') }}
\ No newline at end of file
+{% block include_js %}
+
+    {{ js_include('lib/vod-js-sdk-v6.min.js') }}
+    {{ js_include('lib/clipboard.min.js') }}
+    {{ js_include('admin/js/media.upload.js') }}
+    {{ js_include('admin/js/media.preview.js') }}
+    {{ js_include('admin/js/copy.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/lessons.volt b/app/Http/Admin/Views/chapter/lessons.volt
index 724a09fe..1db88a47 100644
--- a/app/Http/Admin/Views/chapter/lessons.volt
+++ b/app/Http/Admin/Views/chapter/lessons.volt
@@ -1,5 +1,9 @@
-

-    

+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    

+        

         
             
                  返回
@@ -8,53 +12,59 @@
             {{ chapter.title }}
             课时管理
         
+        

+        

+            
+                添加章
+            
+            
+                添加课
+            
+        

     

-    

-        
-            添加章
-        
-        
-            添加课
-        
-    

-

 
-{% if course.model == 'vod' %}
-    {{ partial('chapter/lessons_vod') }}
-{% elseif course.model == 'live' %}
-    {{ partial('chapter/lessons_live') }}
-{% elseif course.model == 'read' %}
-    {{ partial('chapter/lessons_read') }}
-{% endif %}
+    {% if course.model == 'vod' %}
+        {{ partial('chapter/lessons_vod') }}
+    {% elseif course.model == 'live' %}
+        {{ partial('chapter/lessons_live') }}
+    {% elseif course.model == 'read' %}
+        {{ partial('chapter/lessons_read') }}
+    {% endif %}
 
-
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/lessons_live.volt b/app/Http/Admin/Views/chapter/lessons_live.volt
index 029ed8ed..da3caca9 100644
--- a/app/Http/Admin/Views/chapter/lessons_live.volt
+++ b/app/Http/Admin/Views/chapter/lessons_live.volt
@@ -1,55 +1,61 @@
-{%- macro live_time_info(attrs) %}
-    {% if attrs['start_time'] > 0 %}
-        
开始：{{ date('Y-m-d H:i',attrs['start_time']) }}

-        
结束：{{ date('Y-m-d H:i',attrs['end_time']) }}

-    {% else %}
-        N/A
-    {% endif %}
-{%- endmacro %}
+{% extends 'templates/main.volt' %}
 
-
-    -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in lessons %}
+{% block content %}
+
+    {%- macro live_time_info(attrs) %}
+        {% if attrs['start_time'] > 0 %}
+            
开始：{{ date('Y-m-d H:i',attrs['start_time']) }}

+            
结束：{{ date('Y-m-d H:i',attrs['end_time']) }}

+        {% else %}
+            N/A
+        {% endif %}
+    {%- endmacro %}
+
+    









编号名称直播时间排序免费发布操作

+        +            +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-









         
{{ item.id }}
-                {{ item.title }}
-                课
-            {{ live_time_info(item.attrs) }}
-                

-                    
-                    
-                

-            		编号名称直播时间排序免费发布操作
         

+        
+        
+        {% for item in lessons %}
+            
+                {{ item.id }}
+                
+                    {{ item.title }}
+                    课
+                
+                {{ live_time_info(item.attrs) }}
+                
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/lessons_read.volt b/app/Http/Admin/Views/chapter/lessons_read.volt
index e6146fc9..a0652918 100644
--- a/app/Http/Admin/Views/chapter/lessons_read.volt
+++ b/app/Http/Admin/Views/chapter/lessons_read.volt
@@ -1,46 +1,52 @@
-
-    -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in lessons %}
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    









编号名称字数排序免费发布操作

+        +            +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-









         
{{ item.id }}
-                {{ item.title }}
-                课
-            {{ item.attrs['word_count'] }}
-                

-                    
-                    
-                

-            		编号名称字数排序免费发布操作
         

+        
+        
+        {% for item in lessons %}
+            
+                {{ item.id }}
+                
+                    {{ item.title }}
+                    课
+                
+                {{ item.attrs['word_count'] }}
+                
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/chapter/lessons_vod.volt b/app/Http/Admin/Views/chapter/lessons_vod.volt
index de0421a8..e6200405 100644
--- a/app/Http/Admin/Views/chapter/lessons_vod.volt
+++ b/app/Http/Admin/Views/chapter/lessons_vod.volt
@@ -1,63 +1,69 @@
-{%- macro file_status(value) %}
-    {% if value == 'pending' %}
-        待上传
-    {% elseif value == 'uploaded' %}
-        已上传
-    {% elseif value == 'translating' %}
-        转码中
-    {% elseif value == 'translated' %}
-        已转码
-    {% elseif value == 'failed' %}
-        已失败
-    {% endif %}
-{%- endmacro %}
+{% extends 'templates/main.volt' %}
 
-
-    -        -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in lessons %}
+{% block content %}
+
+    {%- macro file_status(value) %}
+        {% if value == 'pending' %}
+            待上传
+        {% elseif value == 'uploaded' %}
+            已上传
+        {% elseif value == 'translating' %}
+            转码中
+        {% elseif value == 'translated' %}
+            已转码
+        {% elseif value == 'failed' %}
+            已失败
+        {% endif %}
+    {%- endmacro %}
+
+    










编号名称视频状态视频时长排序免费发布操作

+        +            +            +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-










         
{{ item.id }}
-                {{ item.title }}
-                课
-            {{ file_status(item.attrs['file_status']) }}{{ item.attrs['duration']|duration }}
-                

-                    
-                    
-                

-            		编号名称视频状态视频时长排序免费发布操作
         

+        
+        
+        {% for item in lessons %}
+            
+                {{ item.id }}
+                
+                    {{ item.title }}
+                    课
+                
+                {{ file_status(item.attrs['file_status']) }}
+                {{ item.attrs['duration']|duration }}
+                
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/course/add.volt b/app/Http/Admin/Views/course/add.volt
index 6510f298..18dfdafa 100644
--- a/app/Http/Admin/Views/course/add.volt
+++ b/app/Http/Admin/Views/course/add.volt
@@ -1,63 +1,67 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加课程
-    

+{% block content %}
 
-    

-        
-        

-            
-            
-            
+    
+        

+            添加课程
+        

+        

+            
+            

+                
+                
+                
+            

         

-    

-
-    

-        
-        

-            

+        

+            
+            

+                

+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
+{% endblock %}
 
-
 
-    });
-
-
+{% endblock %}
diff --git a/app/Http/Admin/Views/course/chapters.volt b/app/Http/Admin/Views/course/chapters.volt
index 461c26a4..1300c4ec 100644
--- a/app/Http/Admin/Views/course/chapters.volt
+++ b/app/Http/Admin/Views/course/chapters.volt
@@ -1,58 +1,64 @@
-

-    

+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    

+        

         
              返回
             {{ course.title }}
             章节管理
         
+        

+        

+            添加章
+            添加课
+        

     

-    

-        添加章
-        添加课
-    

-

 
-
-    -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in chapters %}
+    







编号名称课时数排序操作

+        +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-







         
{{ item.id }}
-                {{ item.title }}
-                章
-            
-                
-                    {{ item.lesson_count }}
-                
-            
-                

-                    
-                    
-                

-            		编号名称课时数排序操作
         

\ No newline at end of file
+        
+        
+        {% for item in chapters %}
+            
+                {{ item.id }}
+                
+                    {{ item.title }}
+                    章
+                
+                
+                    
+                        {{ item.lesson_count }}
+                    
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/course/edit.volt b/app/Http/Admin/Views/course/edit.volt
index 4eb8713f..5304e6f5 100644
--- a/app/Http/Admin/Views/course/edit.volt
+++ b/app/Http/Admin/Views/course/edit.volt
@@ -1,29 +1,110 @@
-

-    编辑课程
-

+{% extends 'templates/main.volt' %}
 
-

+{% block content %}
 
-    
    
-        
  • 基本信息
    • 
-        
  • 课程介绍
    • 
-        
  • 营销设置
    • 
-        
  • 相关课程
    • 
-    

+    

+        编辑课程
+    

 
-    

-        

-            {{ partial('course/edit_basic') }}
-        

-        

-            {{ partial('course/edit_desc') }}
-        

-        

-            {{ partial('course/edit_sale') }}
-        

-        

-            {{ partial('course/edit_related') }}
+    

+        
    
+            
  • 基本信息
    • 
+            
  • 课程介绍
    • 
+            
  • 营销设置
    • 
+            
  • 相关课程
    • 
+        

+        

+            

+                {{ partial('course/edit_basic') }}
+            

+            

+                {{ partial('course/edit_desc') }}
+            

+            

+                {{ partial('course/edit_sale') }}
+            

+            

+                {{ partial('course/edit_related') }}
+            

         

     

 
-

\ No newline at end of file
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('lib/xm-select.js') }}
+    {{ js_include('admin/js/xm-course.js') }}
+    {{ js_include('admin/js/cover.upload.js') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    
+
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/course/edit_basic.volt b/app/Http/Admin/Views/course/edit_basic.volt
index a9886813..e9478094 100644
--- a/app/Http/Admin/Views/course/edit_basic.volt
+++ b/app/Http/Admin/Views/course/edit_basic.volt
@@ -1,12 +1,10 @@
 

-
     

         
         

             
         

     

-
     

         
         

@@ -17,21 +15,18 @@
             
         

     

-
     

         
         

             

         

     

-
     

         
         

             

         

     

-
     

         
         

@@ -41,7 +36,6 @@
             
         

     

-
     

         
         

@@ -49,59 +43,4 @@
             
         

     

-
 

-
-{{ partial('partials/cover_uploader') }}
-
-{{ js_include('lib/xm-select.js') }}
-
-
diff --git a/app/Http/Admin/Views/course/edit_desc.volt b/app/Http/Admin/Views/course/edit_desc.volt
index 13696586..ba02f0dd 100644
--- a/app/Http/Admin/Views/course/edit_desc.volt
+++ b/app/Http/Admin/Views/course/edit_desc.volt
@@ -1,34 +1,33 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        
-        

-            
+{% block content %}
+
+    
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
-
-{{ partial('partials/layedit') }}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/course/edit_related.volt b/app/Http/Admin/Views/course/edit_related.volt
index 35d88859..739b1085 100644
--- a/app/Http/Admin/Views/course/edit_related.volt
+++ b/app/Http/Admin/Views/course/edit_related.volt
@@ -1,12 +1,10 @@
 

-
     

         
         

             

         

     

-
     

         
         

@@ -14,11 +12,5 @@
             
         

     

-
 

 
-{{ js_include('admin/js/xm-course.js') }}
-
-
diff --git a/app/Http/Admin/Views/course/edit_sale.volt b/app/Http/Admin/Views/course/edit_sale.volt
index 61e8f244..bffa86cf 100644
--- a/app/Http/Admin/Views/course/edit_sale.volt
+++ b/app/Http/Admin/Views/course/edit_sale.volt
@@ -1,21 +1,19 @@
 {% set free = course.market_price == 0 %}
 
 

-
     

         
         

-            
-            
+            
+            
         

     

-
     

         

             

                 
                 

-                    
+                    
                 

                 
元

             

@@ -24,7 +22,7 @@
             

                 
                 

-                    
+                    
                 

                 
元

             

@@ -46,7 +44,6 @@
             

         

     

-
     

         
         

@@ -54,25 +51,4 @@
             
         

     

-
-
-
-
+
\ No newline at end of file
diff --git a/app/Http/Admin/Views/course/list.volt b/app/Http/Admin/Views/course/list.volt
index 9788925c..facfacc4 100644
--- a/app/Http/Admin/Views/course/list.volt
+++ b/app/Http/Admin/Views/course/list.volt
@@ -1,118 +1,124 @@
-{%- macro model_info(value) %}
-    {% if value == 'vod' %}
-        点播
-    {% elseif value == 'live' %}
-        直播
-    {% elseif value == 'read' %}
-        图文
-    {% endif %}
-{%- endmacro %}
+{% extends 'templates/main.volt' %}
 
-{%- macro level_info(value) %}
-    难度：
-    {% if value == 'entry' %}
-        入门
-    {% elseif value == 'junior' %}
-        初级
-    {% elseif value == 'medium' %}
-        中级
-    {% elseif value == 'senior' %}
-        高级
-    {% endif %}
-    
-{%- endmacro %}
+{% block content %}
 
-{%- macro category_info(category) %}
-    {% if category %}
-        分类：{{ category.name }}
-    {% endif %}
-{%- endmacro %}
+    {%- macro model_info(value) %}
+        {% if value == 'vod' %}
+            点播
+        {% elseif value == 'live' %}
+            直播
+        {% elseif value == 'read' %}
+            图文
+        {% endif %}
+    {%- endmacro %}
 
-{%- macro teacher_info(teacher) %}
-    {% if teacher %}
-        讲师：{{ teacher.name }}
-    {% endif %}
-{%- endmacro %}
+    {%- macro level_info(value) %}
+        难度：
+        {% if value == 'entry' %}
+            入门
+        {% elseif value == 'junior' %}
+            初级
+        {% elseif value == 'medium' %}
+            中级
+        {% elseif value == 'senior' %}
+            高级
+        {% endif %}
+        
+    {%- endmacro %}
 
-

-    

+    {%- macro category_info(category) %}
+        {% if category %}
+            分类：{{ category.name }}
+        {% endif %}
+    {%- endmacro %}
+
+    {%- macro teacher_info(teacher) %}
+        {% if teacher %}
+            讲师：{{ teacher.name }}
+        {% endif %}
+    {%- endmacro %}
+
+    

+        

         
             课程管理
         
+        

+        

+            
+                搜索课程
+            
+            
+                添加课程
+            
+        

     

-    

-        
-            搜索课程
-        
-        
-            添加课程
-        
-    

-

 
-
-    -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in pager.items %}
+    








课程课时数用户数价格发布操作

+        +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-








         

-                
标题：{{ item.title }} {{ model_info(item.model) }}

-                
{{ category_info(item.category) }}  {{ teacher_info(item.teacher) }}  {{ level_info(item.level) }}

-            		
-                
-                    {{ item.lesson_count }}
-                
-            
-                
-                    {{ item.user_count }}
-                
-            
-                
市场：{{ '￥%0.2f'|format(item.market_price) }}

-                
会员：{{ '￥%0.2f'|format(item.vip_price) }}

-            		
-                

-                    
-                    
-                

-            		课程课时数用户数价格发布操作
         

+        
+        
+        {% for item in pager.items %}
+            
+                
+                    
标题：{{ item.title }} {{ model_info(item.model) }}

+                    
{{ category_info(item.category) }}  {{ teacher_info(item.teacher) }}  {{ level_info(item.level) }}

+                
+                
+                    
+                        {{ item.lesson_count }}
+                    
+                
+                
+                    
+                        {{ item.user_count }}
+                    
+                
+                
+                    
市场：{{ '￥%0.2f'|format(item.market_price) }}

+                    
会员：{{ '￥%0.2f'|format(item.vip_price) }}

+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
 
-{{ partial('partials/pager') }}
\ No newline at end of file
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/course/search.volt b/app/Http/Admin/Views/course/search.volt
index c6267acd..688811d2 100644
--- a/app/Http/Admin/Views/course/search.volt
+++ b/app/Http/Admin/Views/course/search.volt
@@ -1,114 +1,116 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        搜索课程
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            搜索课程
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            

+        

+            
+            

+                

+            

         

-    

-
-    

-        
-        

-            

+        

+            
+            

+                

+            

         

-    

-
-    

-        
-        

-            
-            
-            
+        

+            
+            

+                
+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
-            
-            
+        

+            
+            

+                
+                
+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
+{% endblock %}
 
-{{ js_include('lib/xm-select.js') }}
+{% block include_js %}
 
-
\ No newline at end of file
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/group/add.volt b/app/Http/Admin/Views/group/add.volt
index 210d4a28..28aac0ed 100644
--- a/app/Http/Admin/Views/group/add.volt
+++ b/app/Http/Admin/Views/group/add.volt
@@ -1,37 +1,37 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加群组
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            添加群组
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/group/edit.volt b/app/Http/Admin/Views/group/edit.volt
index 4d671f53..10be069f 100644
--- a/app/Http/Admin/Views/group/edit.volt
+++ b/app/Http/Admin/Views/group/edit.volt
@@ -1,57 +1,59 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑群组
-    

+{% block content %}
 
-    

-        
-        

-            
-            
+    
+        

+            编辑群组
+        

+        

+            
+            

+                
+                
+            

+            

+                
+            

         

-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-    

-        
-        

-            
-            
-        

-    

+{% endblock %}
 
-
+{% block include_js %}
 
-{{ partial('partials/avatar_uploader') }}
\ No newline at end of file
+    {{ js_include('admin/js/avatar.upload.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/group/list.volt b/app/Http/Admin/Views/group/list.volt
index 28c448ac..92834c3c 100644
--- a/app/Http/Admin/Views/group/list.volt
+++ b/app/Http/Admin/Views/group/list.volt
@@ -1,71 +1,77 @@
-{%- macro type_info(value) %}
-    {% if value == 'course' %}
-        课
-    {% elseif value == 'chat' %}
-        聊
-    {% endif %}
-{%- endmacro %}
+{% extends 'templates/main.volt' %}
 
-{%- macro owner_info(owner) %}
-    {% if owner %}
-        {{ owner.name }}（{{ owner.id }}）
-    {% else %}
-        未设置
-    {% endif %}
-{%- endmacro %}
+{% block content %}
 
-

-    

+    {%- macro type_info(value) %}
+        {% if value == 'course' %}
+            课
+        {% elseif value == 'chat' %}
+            聊
+        {% endif %}
+    {%- endmacro %}
+
+    {%- macro owner_info(owner) %}
+        {% if owner %}
+            {{ owner.name }}（{{ owner.id }}）
+        {% else %}
+            未设置
+        {% endif %}
+    {%- endmacro %}
+
+    

+        

         
             群组管理
         
+        

+        

+            
+                添加群组
+            
+        

     

-    

-        
-            添加群组
-        
-    

-

 
-
-    -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in pager.items %}
+    








编号名称群主成员发布操作

+        +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-








         
{{ item.id }}{{ item.name }} {{ type_info(item.type) }}{{ owner_info(item.owner) }}{{ item.user_count }}
-                

-                    
-                    
-                

-            		编号名称群主成员发布操作
         

+        
+        
+        {% for item in pager.items %}
+            
+                {{ item.id }}
+                {{ item.name }} {{ type_info(item.type) }}
+                {{ owner_info(item.owner) }}
+                {{ item.user_count }}
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
 
-{{ partial('partials/pager') }}
\ No newline at end of file
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/group/search.volt b/app/Http/Admin/Views/group/search.volt
index 671cf511..2769b899 100644
--- a/app/Http/Admin/Views/group/search.volt
+++ b/app/Http/Admin/Views/group/search.volt
@@ -1,67 +1,63 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        搜索群组
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            搜索群组
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/help/add.volt b/app/Http/Admin/Views/help/add.volt
index bb8ad9f8..7d989fcd 100644
--- a/app/Http/Admin/Views/help/add.volt
+++ b/app/Http/Admin/Views/help/add.volt
@@ -1,46 +1,43 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加帮助
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            添加帮助
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
-
-{{ partial('partials/layedit') }}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/help/edit.volt b/app/Http/Admin/Views/help/edit.volt
index 562d57d3..84520506 100644
--- a/app/Http/Admin/Views/help/edit.volt
+++ b/app/Http/Admin/Views/help/edit.volt
@@ -1,47 +1,44 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑帮助
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            编辑帮助
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
-
-{{ partial('partials/layedit') }}
+{% endblock %}
 
diff --git a/app/Http/Admin/Views/help/list.volt b/app/Http/Admin/Views/help/list.volt
index e1d4aebe..fbb8f0bc 100644
--- a/app/Http/Admin/Views/help/list.volt
+++ b/app/Http/Admin/Views/help/list.volt
@@ -1,57 +1,63 @@
-

-    

+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    

+        

         
             帮助管理
         
+        

+        

+            
+                添加帮助
+            
+        

     

-    

-        
-            添加帮助
-        
-    

-

 
-
-    -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in helps %}
+    









编号标题创建时间更新时间排序发布操作

+        +            +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-









         
{{ item.id }}{{ item.title }}{{ date('Y-m-d H:i',item.create_time) }}{{ date('Y-m-d H:i',item.update_time) }}
-            
-                

-                    
-                    
-                

-            		编号标题创建时间更新时间排序发布操作
         

\ No newline at end of file
+        
+        
+        {% for item in helps %}
+            
+                {{ item.id }}
+                {{ item.title }}
+                {{ date('Y-m-d H:i',item.create_time) }}
+                {{ date('Y-m-d H:i',item.update_time) }}
+                
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt
index 398cea62..f3cc1338 100644
--- a/app/Http/Admin/Views/index/index.volt
+++ b/app/Http/Admin/Views/index/index.volt
@@ -1,6 +1,5 @@
 
-
-
+
 
     
     
@@ -11,11 +10,8 @@
     {{ js_include('lib/layui/layui.js') }}
     {{ js_include('admin/js/index.js') }}
 
-
 
-
 

-
     

         
         

@@ -42,7 +38,6 @@
             
         
     

-
     

         

             {% for key,level in left_menus %}
@@ -61,16 +56,12 @@
             {% endfor %}
         

     

-
     

         
     

-
     

         © 2020 koogua.com all rights reserved
     

-
 

-
 
 
\ No newline at end of file
diff --git a/app/Http/Admin/Views/index/main.volt b/app/Http/Admin/Views/index/main.volt
index e69de29b..4d336d2e 100644
--- a/app/Http/Admin/Views/index/main.volt
+++ b/app/Http/Admin/Views/index/main.volt
@@ -0,0 +1,5 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/nav/add.volt b/app/Http/Admin/Views/nav/add.volt
index 80c1cc87..2da3fe53 100644
--- a/app/Http/Admin/Views/nav/add.volt
+++ b/app/Http/Admin/Views/nav/add.volt
@@ -1,75 +1,71 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加导航
-    

+{% block content %}
 
-    {% if parent_id > 0 %}
+    
+        

+            添加导航
+        

+        {% if parent_id > 0 %}
+            

+                
+                

+                    
+                

+            

+        {% endif %}
         

-            
+            
             

-                
+                
             

         

-    {% endif %}
-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+                
+            

         

-    

+    
 
-    

-        
-        

-            
-            
-            
-        

-    

-
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/nav/edit.volt b/app/Http/Admin/Views/nav/edit.volt
index ffa4bb3e..ec6cb990 100644
--- a/app/Http/Admin/Views/nav/edit.volt
+++ b/app/Http/Admin/Views/nav/edit.volt
@@ -1,60 +1,57 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑导航
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            编辑导航
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/nav/list.volt b/app/Http/Admin/Views/nav/list.volt
index 397ad959..31071c57 100644
--- a/app/Http/Admin/Views/nav/list.volt
+++ b/app/Http/Admin/Views/nav/list.volt
@@ -1,21 +1,25 @@
-{%- macro position_info(value) %}
-    {% if value == 'top' %}
-        顶部
-    {% elseif value == 'bottom' %}
-        底部
-    {% endif %}
-{%- endmacro %}
+{% extends 'templates/main.volt' %}
 
-{%- macro target_info(value) %}
-    {% if value == '_blank' %}
-        新窗口
-    {% elseif value == '_self' %}
-        原窗口
-    {% endif %}
-{%- endmacro %}
+{% block content %}
 
-

-    

+    {%- macro position_info(value) %}
+        {% if value == 'top' %}
+            顶部
+        {% elseif value == 'bottom' %}
+            底部
+        {% endif %}
+    {%- endmacro %}
+
+    {%- macro target_info(value) %}
+        {% if value == '_blank' %}
+            新窗口
+        {% elseif value == '_self' %}
+            原窗口
+        {% endif %}
+    {%- endmacro %}
+
+    

+        

         
             {% if parent.id > 0 %}
                 
@@ -25,68 +29,70 @@
             {% endif %}
             导航管理
         
+        

+        

+            
+                添加导航
+            
+        

     

-    

-        
-            添加导航
-        
-    

-

 
-
-    -        -        -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in navs %}
+    











编号名称层级节点数位置目标排序发布操作

+        +            +            +            +            +            +            +            +            +            +        
+        
-            
-            {% if item.position == 'top' and item.level < 2 %}
-                
-            {% else %}
-                
-            {% endif %}
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-











         
{{ item.id }}{{ item.name }}{{ item.name }}{{ item.level }}{{ item.child_count }}{{ position_info(item.position) }}{{ target_info(item.target) }}
-                

-                    
-                    
-                

-            		编号名称层级节点数位置目标排序发布操作
         

\ No newline at end of file
+        
+        
+        {% for item in navs %}
+            
+                {{ item.id }}
+                {% if item.position == 'top' and item.level < 2 %}
+                    {{ item.name }}
+                {% else %}
+                    {{ item.name }}
+                {% endif %}
+                {{ item.level }}
+                {{ item.child_count }}
+                {{ position_info(item.position) }}
+                {{ target_info(item.target) }}
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/order/list.volt b/app/Http/Admin/Views/order/list.volt
index 0c5ada41..e006c258 100644
--- a/app/Http/Admin/Views/order/list.volt
+++ b/app/Http/Admin/Views/order/list.volt
@@ -1,57 +1,63 @@
-{{ partial('order/macro') }}
+{% extends 'templates/main.volt' %}
 
-

-    

+{% block content %}
+
+    {{ partial('order/macro') }}
+
+    

+        

         
             订单管理
         
+        

+        

+            
+                搜索订单
+            
+        

     

-    

-        
-            搜索订单
-        
-    

-

 
-
-    -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in pager.items %}
+    








商品信息买家信息订单金额订单状态创建时间操作

+        +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-








         

-                
商品：{{ item.subject }} {{ item_type(item.item_type) }}

-                
单号：{{ item.sn }}

-            		
-                
昵称：{{ item.owner.name }}

-                
编号：{{ item.owner.id }}

-            		{{ '￥%0.2f'|format(item.amount) }}{{ order_status(item.status) }}{{ date('Y-m-d H:i:s',item.create_time) }}
-                详情
-            商品信息买家信息订单金额订单状态创建时间操作
         

+        
+        
+        {% for item in pager.items %}
+            
+                
+                    
商品：{{ item.subject }} {{ item_type(item.item_type) }}

+                    
单号：{{ item.sn }}

+                
+                
+                    
昵称：{{ item.owner.name }}

+                    
编号：{{ item.owner.id }}

+                
+                {{ '￥%0.2f'|format(item.amount) }}
+                {{ order_status(item.status) }}
+                {{ date('Y-m-d H:i:s',item.create_time) }}
+                
+                    详情
+                
+            
+        {% endfor %}
+        
+    
 
-{{ partial('partials/pager') }}
\ No newline at end of file
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/order/search.volt b/app/Http/Admin/Views/order/search.volt
index e98fdcff..f5e88b47 100644
--- a/app/Http/Admin/Views/order/search.volt
+++ b/app/Http/Admin/Views/order/search.volt
@@ -1,79 +1,81 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        搜索订单
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            搜索订单
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
-            
-            
-            
+        

+            
+            

+                
+                
+                
+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
-            
-            
+        

+            
+            

+                
+                
+                
+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

+            
 -

+            

+                
+            

         

-        
 - 

-        

-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-    

-        
-        

-            
-            
-        

-    

+{% endblock %}
 
-
+{% block inline_js %}
 
-
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/order/show.volt b/app/Http/Admin/Views/order/show.volt
index 4754ea23..d54cb9cc 100644
--- a/app/Http/Admin/Views/order/show.volt
+++ b/app/Http/Admin/Views/order/show.volt
@@ -1,73 +1,82 @@
-{{ partial('order/macro') }}
-{{ partial('trade/macro') }}
-{{ partial('refund/macro') }}
+{% extends 'templates/main.volt' %}
 
-{{ partial('order/order_info') }}
+{% block content %}
 
-

+    {{ partial('order/macro') }}
+    {{ partial('trade/macro') }}
+    {{ partial('refund/macro') }}
+    {{ partial('order/order_info') }}
 
-

-    
-

-
-{% if refunds.count() > 0 %}
-    

-        退款信息
-    

-    
-        
-            
-            
-            
-            
-            
-            
-        
-        {% for item in refunds %}
-            {% set refund_sh_url = url({'for':'admin.refund.status_history','id':item.id}) %}
-            {% set refund_show_url = url({'for':'admin.refund.show','id':item.id}) %}
-            
-                
-                
-                
-                
-                
-                
-            
-        {% endfor %}
-    
退款序号退款金额退款原因退款状态创建时间
{{ item.sn }}{{ '￥%0.2f'|format(item.amount) }}{{ substr(item.apply_note,0,15) }}{{ refund_status(item.status) }}{{ date('Y-m-d H:i:s',item.create_time) }}详情

     

-{% endif %}
 
-{% if trades.count() > 0 %}
-    

-        交易信息
-    

-    
-        
-            
-            
-            
-            
-            
-            
-        
-        {% for item in trades %}
-            {% set trade_sh_url = url({'for':'admin.trade.status_history','id':item.id}) %}
-            {% set trade_show_url = url({'for':'admin.trade.show','id':item.id}) %}
+    

+        
+    

+
+    {% if refunds.count() > 0 %}
+        

+            退款信息
+        

+        
交易序号交易金额交易平台交易状态创建时间

-                
-                
-                
-                
-                
-                
+                
+                
+                
+                
+                
+                
-        {% endfor %}
-    

             
{{ item.sn }}{{ '￥%0.2f'|format(item.amount) }}{{ channel_type(item.channel) }}{{ trade_status(item.status) }}{{ date('Y-m-d H:i:s',item.create_time) }}详情退款序号退款金额退款原因退款状态创建时间
             

-    

-{% endif %}
+            {% for item in refunds %}
+                {% set refund_sh_url = url({'for':'admin.refund.status_history','id':item.id}) %}
+                {% set refund_show_url = url({'for':'admin.refund.show','id':item.id}) %}
+                
+                    {{ item.sn }}
+                    {{ '￥%0.2f'|format(item.amount) }}
+                    {{ substr(item.apply_note,0,15) }}
+                    {{ refund_status(item.status) }}
+                    {{ date('Y-m-d H:i:s',item.create_time) }}
+                    详情
+                
+            {% endfor %}
+        
+        

+    {% endif %}
 
-{{ partial('order/user_info') }}
+    {% if trades.count() > 0 %}
+        

+            交易信息
+        

+        
+            
+                
+                
+                
+                
+                
+                
+            
+            {% for item in trades %}
+                {% set trade_sh_url = url({'for':'admin.trade.status_history','id':item.id}) %}
+                {% set trade_show_url = url({'for':'admin.trade.show','id':item.id}) %}
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                
+            {% endfor %}
+        
交易序号交易金额交易平台交易状态创建时间
{{ item.sn }}{{ '￥%0.2f'|format(item.amount) }}{{ channel_type(item.channel) }}{{ trade_status(item.status) }}{{ date('Y-m-d H:i:s',item.create_time) }}详情

+        

+    {% endif %}
 
-{{ js_include('admin/js/status-history.js') }}
\ No newline at end of file
+    {{ partial('order/user_info') }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('admin/js/status-history.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/order/status_history.volt b/app/Http/Admin/Views/order/status_history.volt
index 8ecbe456..41ab81c5 100644
--- a/app/Http/Admin/Views/order/status_history.volt
+++ b/app/Http/Admin/Views/order/status_history.volt
@@ -1,14 +1,20 @@
-{{ partial('order/macro') }}
+{% extends 'templates/main.volt' %}
 
-
-    
-        
-        
-    
-    {% for item in status_history %}
+{% block content %}
+
+    {{ partial('order/macro') }}
+
+    
状态时间

-            
-            
+            
+            
-    {% endfor %}
-

         
{{ order_status(item.status) }}{{ date('Y-m-d H:i:s',item.create_time) }}状态时间
         

\ No newline at end of file
+        {% for item in status_history %}
+            
+                {{ order_status(item.status) }}
+                {{ date('Y-m-d H:i:s',item.create_time) }}
+            
+        {% endfor %}
+    
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/package/add.volt b/app/Http/Admin/Views/package/add.volt
index e17239b6..d8d8cc16 100644
--- a/app/Http/Admin/Views/package/add.volt
+++ b/app/Http/Admin/Views/package/add.volt
@@ -1,29 +1,30 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加套餐
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            添加套餐
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/package/edit.volt b/app/Http/Admin/Views/package/edit.volt
index 70f8ca59..61432b1d 100644
--- a/app/Http/Admin/Views/package/edit.volt
+++ b/app/Http/Admin/Views/package/edit.volt
@@ -1,91 +1,97 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑套餐
-    

+{% block content %}
 
-    

-        
-        

-            
-        

-    

-
-    

-        
-        

-            
-        

-    

-
-    

-        
-        

-            

-        

-    

-
-    

-        

-            
-            

-                
-            

-            
元

-            

-                （价格参考）
+    
+        

+            编辑套餐
+        

+        

+            
+            

+                
             

         

-    

-
-    

-        

-            
-            

-                
-            

-            
元

-            

-                （价格参考）
+        

+            
+            

+                
             

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                

+            

         

-    

+        

+            

+                
+                

+                    
+                

+                
元

+                

+                    （价格参考）
+                

+            

+        

+        

+            

+                
+                

+                    
+                

+                
元

+                

+                    （价格参考）
+                

+            

+        

+        

+            
+            

+                
+                
+            

+        

+    
 
-
+{% endblock %}
 
-{{ js_include('lib/xm-select.js') }}
-{{ js_include('admin/js/xm-course.js') }}
+{% block include_js %}
 
-
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/package/guiding.volt b/app/Http/Admin/Views/package/guiding.volt
index c1b787a5..c3ab1c8d 100644
--- a/app/Http/Admin/Views/package/guiding.volt
+++ b/app/Http/Admin/Views/package/guiding.volt
@@ -1,40 +1,47 @@
-{{ partial('course/expiry_macro') }}
+{% extends 'templates/main.volt' %}
 
-
-    -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-    
-    
-    
-    {% for item in courses %}
+{% block content %}
+
+    {{ partial('course/expiry_macro') }}
+
+    






标题课时数有效期价格

+        +            +            +            +            +        
+        
-            
-            
-            
-            
+            
+            
+            
+            
-    {% endfor %}
-    
-






         
{{ item.title }}{{ item.lesson_count }}{{ study_expiry_info(item.study_expiry) }}
-                
市场价：{{ '￥%0.2f'|format(item.market_price) }}

-                
会员价：{{ '￥%0.2f'|format(item.vip_price) }}

-            		标题课时数有效期价格
         

+        
+        
+        {% for item in courses %}
+            
+                {{ item.title }}
+                {{ item.lesson_count }}
+                {{ study_expiry_info(item.study_expiry) }}
+                
+                    
市场价：{{ '￥%0.2f'|format(item.market_price) }}

+                    
会员价：{{ '￥%0.2f'|format(item.vip_price) }}

+                
+            
+        {% endfor %}
+        
+    
 
-

+    

 
-

-    建议市场价：￥{{ guiding_price.market_price }}
-      
-    建议会员价：￥{{ guiding_price.vip_price }}
-

-

\ No newline at end of file
+    

+        建议市场价：￥{{ guiding_price.market_price }}
+          
+        建议会员价：￥{{ guiding_price.vip_price }}
+    

+
+    

+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/package/list.volt b/app/Http/Admin/Views/package/list.volt
index 062edfb0..58691302 100644
--- a/app/Http/Admin/Views/package/list.volt
+++ b/app/Http/Admin/Views/package/list.volt
@@ -1,58 +1,64 @@
-

-    

-        
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    

+        

+        
             套餐管理
         
+        

+        

+            
+                添加套餐
+            
+        

     

-    

-        
-            添加套餐
-        
-    

-

 
-
-    -        -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in pager.items %}
+    









编号标题课程数市场价会员价发布操作

+        +            +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-









         
{{ item.id }}{{ item.title }}{{ item.course_count }}{{ '￥%0.2f'|format(item.market_price) }}{{ '￥%0.2f'|format(item.vip_price) }}
-                

-                    
-                    
-                

-            		编号标题课程数市场价会员价发布操作
         

+        
+        
+        {% for item in pager.items %}
+            
+                {{ item.id }}
+                {{ item.title }}
+                {{ item.course_count }}
+                {{ '￥%0.2f'|format(item.market_price) }}
+                {{ '￥%0.2f'|format(item.vip_price) }}
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
 
-{{ partial('partials/pager') }}
\ No newline at end of file
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/package/search.volt b/app/Http/Admin/Views/package/search.volt
index ed247d84..2e988077 100644
--- a/app/Http/Admin/Views/package/search.volt
+++ b/app/Http/Admin/Views/package/search.volt
@@ -1,45 +1,44 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        搜索套餐
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            搜索套餐
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

+    
 
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/page/add.volt b/app/Http/Admin/Views/page/add.volt
index 807e78d4..e7bd6064 100644
--- a/app/Http/Admin/Views/page/add.volt
+++ b/app/Http/Admin/Views/page/add.volt
@@ -1,39 +1,37 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        添加单页
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            添加单页
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
 
 
-{{ partial('partials/layedit') }}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/page/edit.volt b/app/Http/Admin/Views/page/edit.volt
index a276f144..20cddc2d 100644
--- a/app/Http/Admin/Views/page/edit.volt
+++ b/app/Http/Admin/Views/page/edit.volt
@@ -1,40 +1,37 @@
-

+{% extends 'templates/main.volt' %}
 
-    

-        编辑单页
-    

+{% block content %}
 
-    

-        
-        

-            
+    
+        

+            编辑单页
+        

+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
+        

+            
+            

+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-    

-        
-        

-            
-            
+        

+            
+            

+                
+                
+            

         

-    

-
-
-
-{{ partial('partials/layedit') }}
+    
 
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/page/list.volt b/app/Http/Admin/Views/page/list.volt
index 79069c5a..1d630df4 100644
--- a/app/Http/Admin/Views/page/list.volt
+++ b/app/Http/Admin/Views/page/list.volt
@@ -1,56 +1,62 @@
-

-    

+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    

+        

         
             单页管理
         
+        

+        

+            
+                添加单页
+            
+        

     

-    

-        
-            添加单页
-        
-    

-

 
-
-    -        -        -        -        -        -        -    
-    
-    
-        
-        
-        
-        
-        
-        
-    
-    
-    
-    {% for item in pager.items %}
+    








编号标题创建时间更新时间发布操作

+        +            +            +            +            +            +            +        
+        
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
-    {% endfor %}
-    
-








         
{{ item.id }}{{ item.title }}{{ date('Y-m-d H:i',item.create_time) }}{{ date('Y-m-d H:i',item.update_time) }}
-            
-                

-                    
-                    
-                

-            		编号标题创建时间更新时间发布操作
         

+        
+        
+        {% for item in pager.items %}
+            
+                {{ item.id }}
+                {{ item.title }}
+                {{ date('Y-m-d H:i',item.create_time) }}
+                {{ date('Y-m-d H:i',item.update_time) }}
+                
+                
+                
+                    

+                        
+                        
+                    

+                
+            
+        {% endfor %}
+        
+    
 
-{{ partial('partials/pager') }}
\ No newline at end of file
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/avatar_uploader.volt b/app/Http/Admin/Views/partials/avatar_uploader.volt
deleted file mode 100644
index 779b3e03..00000000
--- a/app/Http/Admin/Views/partials/avatar_uploader.volt
+++ /dev/null
@@ -1,49 +0,0 @@
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/clipboard_tips.volt b/app/Http/Admin/Views/partials/clipboard_tips.volt
deleted file mode 100644
index 49a831a1..00000000
--- a/app/Http/Admin/Views/partials/clipboard_tips.volt
+++ /dev/null
@@ -1,16 +0,0 @@
-{{ js_include('lib/clipboard.min.js') }}
-
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/cover_uploader.volt b/app/Http/Admin/Views/partials/cover_uploader.volt
deleted file mode 100644
index 0ec8d1f4..00000000
--- a/app/Http/Admin/Views/partials/cover_uploader.volt
+++ /dev/null
@@ -1,29 +0,0 @@
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/ip2region.volt b/app/Http/Admin/Views/partials/ip2region.volt
deleted file mode 100644
index aef53ccf..00000000
--- a/app/Http/Admin/Views/partials/ip2region.volt
+++ /dev/null
@@ -1,22 +0,0 @@
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/layedit.volt b/app/Http/Admin/Views/partials/layedit.volt
deleted file mode 100644
index 2189caeb..00000000
--- a/app/Http/Admin/Views/partials/layedit.volt
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/media_preview.volt b/app/Http/Admin/Views/partials/media_preview.volt
deleted file mode 100644
index 6810c84f..00000000
--- a/app/Http/Admin/Views/partials/media_preview.volt
+++ /dev/null
@@ -1,24 +0,0 @@
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/partials/media_uploader.volt b/app/Http/Admin/Views/partials/media_uploader.volt
deleted file mode 100644
index e416e276..00000000
--- a/app/Http/Admin/Views/partials/media_uploader.volt
+++ /dev/null
@@ -1,64 +0,0 @@
-{{ js_include('lib/vod-js-sdk-v6.min.js') }}
-
-
\ No newline at end of file
diff --git a/app/Http/Admin/Views/public/ip2region.volt b/app/Http/Admin/Views/public/ip2region.volt
index f4de7db5..f405a6b3 100644
--- a/app/Http/Admin/Views/public/ip2region.volt
+++ b/app/Http/Admin/Views/public/ip2region.volt
@@ -1,14 +1,20 @@
-
-    
-        
-        
-        
-        
-    
-    
-        
-        
-        
-        
-    
-
国家省份城市运营商
{{ region.country }}{{ region.province }}{{ region.city }}{{ region.isp }}

\ No newline at end of file
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    
+        
+            
+            
+            
+            
+        
+        
+            
+            
+            
+            
+        
+    
国家省份城市运营商
{{ region.country }}{{ region.province }}{{ region.city }}{{ region.isp }}

+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/public/login.volt b/app/Http/Admin/Views/public/login.volt
index 89129372..e45520d3 100644
--- a/app/Http/Admin/Views/public/login.volt
+++ b/app/Http/Admin/Views/public/login.volt
@@ -1,64 +1,69 @@
-