From 20fb468f0d84d2b01f1fa17484c51e05610c36e8 Mon Sep 17 00:00:00 2001 From: koogua Date: Fri, 12 Aug 2022 17:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BC=98=E5=8C=96css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../Admin/Controllers/CategoryController.php | 3 + app/Http/Admin/Services/Category.php | 45 +++++ app/Http/Admin/Views/category/list.volt | 3 +- app/Http/Admin/Views/course/edit_sale.volt | 9 - app/Http/Admin/Views/macros/point_gift.volt | 4 +- app/Http/Admin/Views/point_gift/list.volt | 2 +- .../Admin/Views/point_gift_redeem/list.volt | 4 +- app/Http/Home/Controllers/PointController.php | 30 ++++ .../Home/Controllers/PointGiftController.php | 6 +- app/Http/Home/Views/article/list.volt | 2 +- app/Http/Home/Views/article/show.volt | 9 +- app/Http/Home/Views/article/show_owner.volt | 2 +- app/Http/Home/Views/chapter/live/active.volt | 7 +- app/Http/Home/Views/chapter/read.volt | 9 +- app/Http/Home/Views/chapter/vod.volt | 9 +- app/Http/Home/Views/comment/info.volt | 2 +- app/Http/Home/Views/consult/show.volt | 8 +- app/Http/Home/Views/course/packages.volt | 2 +- app/Http/Home/Views/course/pager.volt | 2 +- app/Http/Home/Views/course/show.volt | 10 +- app/Http/Home/Views/course/show_catalog.volt | 8 +- app/Http/Home/Views/course/show_meta.volt | 8 +- app/Http/Home/Views/course/show_teacher.volt | 2 +- app/Http/Home/Views/flash_sale/index.volt | 2 +- app/Http/Home/Views/help/show.volt | 2 +- app/Http/Home/Views/index/full.volt | 2 +- app/Http/Home/Views/index/simple.volt | 2 +- app/Http/Home/Views/macros/course.volt | 2 +- app/Http/Home/Views/macros/point_gift.volt | 4 +- app/Http/Home/Views/macros/point_history.volt | 8 +- app/Http/Home/Views/order/confirm.volt | 10 +- app/Http/Home/Views/page/show.volt | 2 +- .../{point_gift => point/gift}/list.volt | 0 .../{point_gift => point/gift}/pager.volt | 4 +- .../{point_gift => point/gift}/show.volt | 40 ++--- app/Http/Home/Views/point/rule.volt | 106 +++++++++++ app/Http/Home/Views/question/list.volt | 2 +- app/Http/Home/Views/question/show.volt | 9 +- app/Http/Home/Views/question/show_owner.volt | 2 +- app/Http/Home/Views/search/index.volt | 2 +- app/Http/Home/Views/tag/list_pager.volt | 2 +- app/Http/Home/Views/tag/my_pager.volt | 2 +- .../Home/Views/teacher/console/consults.volt | 4 +- .../Home/Views/teacher/console/courses.volt | 4 +- .../Home/Views/teacher/console/lives.volt | 4 +- app/Http/Home/Views/teacher/pager.volt | 5 +- app/Http/Home/Views/topic/courses.volt | 2 +- .../Views/user/console/account_email.volt | 2 +- .../Home/Views/user/console/account_info.volt | 63 ++++--- .../Views/user/console/account_password.volt | 2 +- .../Views/user/console/account_phone.volt | 2 +- app/Http/Home/Views/user/console/answers.volt | 4 +- .../Home/Views/user/console/articles.volt | 4 +- .../Home/Views/user/console/consults.volt | 4 +- app/Http/Home/Views/user/console/contact.volt | 2 +- app/Http/Home/Views/user/console/courses.volt | 4 +- .../Home/Views/user/console/favorites.volt | 2 +- .../Views/user/console/favorites_article.volt | 2 +- .../Views/user/console/favorites_course.volt | 2 +- .../user/console/favorites_question.volt | 2 +- app/Http/Home/Views/user/console/menu.volt | 10 -- .../Views/user/console/notifications.volt | 4 +- app/Http/Home/Views/user/console/orders.volt | 56 +++--- .../user/console/point_gift_redeems.volt | 8 +- .../Views/user/console/point_history.volt | 15 +- app/Http/Home/Views/user/console/profile.volt | 2 +- .../Home/Views/user/console/questions.volt | 4 +- app/Http/Home/Views/user/console/refunds.volt | 50 ++++-- app/Http/Home/Views/user/console/reviews.volt | 4 +- .../Home/Views/user/console/subscribe.volt | 2 +- app/Http/Home/Views/user/courses.volt | 2 +- app/Http/Home/Views/user/show.volt | 2 +- app/Http/Home/Views/vip/courses.volt | 2 +- app/Http/Home/Views/vip/users.volt | 2 +- app/Http/Home/Views/widget/top_authors.volt | 2 +- app/Models/Course.php | 2 + app/Models/User.php | 8 - app/Repos/User.php | 10 -- app/Services/Logic/User/UserInfo.php | 7 - public/static/home/css/common.css | 170 ++++++++---------- public/static/home/js/point.rule.js | 16 ++ public/static/lib/kindeditor/content.css | 4 + 83 files changed, 538 insertions(+), 348 deletions(-) create mode 100644 app/Http/Home/Controllers/PointController.php rename app/Http/Home/Views/{point_gift => point/gift}/list.volt (100%) rename app/Http/Home/Views/{point_gift => point/gift}/pager.volt (89%) rename app/Http/Home/Views/{point_gift => point/gift}/show.volt (78%) create mode 100644 app/Http/Home/Views/point/rule.volt create mode 100644 public/static/home/js/point.rule.js diff --git a/.gitignore b/.gitignore index c1e37b3e..5870809d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ /public/robots.txt /public/sitemap.xml /public/h5 +/storage/cache/purifier *KgTest* diff --git a/app/Http/Admin/Controllers/CategoryController.php b/app/Http/Admin/Controllers/CategoryController.php index ac0c3720..a82dffe2 100644 --- a/app/Http/Admin/Controllers/CategoryController.php +++ b/app/Http/Admin/Controllers/CategoryController.php @@ -35,9 +35,12 @@ class CategoryController extends Controller $categories = $categoryService->getTopCategories($type); } + $showAddButton = $categoryService->showAddButton($type, $parent); + $this->view->setVar('type', $type); $this->view->setVar('parent', $parent); $this->view->setVar('categories', $categories); + $this->view->setVar('show_add_button', $showAddButton); } /** diff --git a/app/Http/Admin/Services/Category.php b/app/Http/Admin/Services/Category.php index e5750e6c..92e8caf8 100644 --- a/app/Http/Admin/Services/Category.php +++ b/app/Http/Admin/Services/Category.php @@ -17,6 +17,51 @@ use App\Validators\Category as CategoryValidator; class Category extends Service { + public function getCategoryOptions($type) + { + $cache = new CategoryTreeListCache(); + + $categories = $cache->get($type); + + $result = []; + + if (!$categories) return $result; + + foreach ($categories as $category) { + $result[] = [ + 'id' => $category['id'], + 'name' => $category['name'], + ]; + if (count($category['children']) > 0) { + foreach ($category['children'] as $child) { + $result[] = [ + 'id' => $child['id'], + 'name' => sprintf('|--- %s', $child['name']), + ]; + } + } + } + + return $result; + } + + public function showAddButton($type, CategoryModel $parent) + { + $result = true; + + if ($type == CategoryModel::TYPE_COURSE) { + $result = $parent->level < 2; + } elseif ($type == CategoryModel::TYPE_HELP) { + $result = $parent->level < 1; + } elseif ($type == CategoryModel::TYPE_ARTICLE) { + $result = $parent->level < 1; + } elseif ($type == CategoryModel::TYPE_QUESTION) { + $result = $parent->level < 1; + } + + return $result; + } + public function getCategory($id) { return $this->findOrFail($id); diff --git a/app/Http/Admin/Views/category/list.volt b/app/Http/Admin/Views/category/list.volt index 4683373c..2b79388e 100644 --- a/app/Http/Admin/Views/category/list.volt +++ b/app/Http/Admin/Views/category/list.volt @@ -4,7 +4,6 @@ {% set back_url = url({'for':'admin.category.list'},{'type':type}) %} {% set add_url = url({'for':'admin.category.add'},{'type':type,'parent_id':parent.id}) %} - {% set allow_add = (type == 1 and parent.level < 2) or (type == 2 and parent.level < 1) %}
@@ -17,7 +16,7 @@
- {% if allow_add %} + {% if show_add_button %} 添加分类 {% endif %}
diff --git a/app/Http/Admin/Views/course/edit_sale.volt b/app/Http/Admin/Views/course/edit_sale.volt index 8cc7b640..d08ff074 100644 --- a/app/Http/Admin/Views/course/edit_sale.volt +++ b/app/Http/Admin/Views/course/edit_sale.volt @@ -8,15 +8,6 @@
人
-
-
- -
- -
-
元
-
-
diff --git a/app/Http/Admin/Views/macros/point_gift.volt b/app/Http/Admin/Views/macros/point_gift.volt index 9f6e695a..9a260161 100644 --- a/app/Http/Admin/Views/macros/point_gift.volt +++ b/app/Http/Admin/Views/macros/point_gift.volt @@ -1,4 +1,4 @@ -{%- macro gift_type_info(value) %} +{%- macro gift_type(value) %} {% if value == 1 %} 课程 {% elseif value == 2 %} @@ -8,7 +8,7 @@ {% endif %} {%- endmacro %} -{%- macro redeem_status_info(value) %} +{%- macro redeem_status(value) %} {% if value == 1 %} 处理中 {% elseif value == 2 %} diff --git a/app/Http/Admin/Views/point_gift/list.volt b/app/Http/Admin/Views/point_gift/list.volt index c8224b80..09eccbd8 100644 --- a/app/Http/Admin/Views/point_gift/list.volt +++ b/app/Http/Admin/Views/point_gift/list.volt @@ -63,7 +63,7 @@ {{ item.id }} {{ item.name }} - {{ gift_type_info(item.type) }} + {{ gift_type(item.type) }} {{ item.point }} {{ item.stock }} {{ item.redeem_limit }} diff --git a/app/Http/Admin/Views/point_gift_redeem/list.volt b/app/Http/Admin/Views/point_gift_redeem/list.volt index 7d622590..a75cfc9b 100644 --- a/app/Http/Admin/Views/point_gift_redeem/list.volt +++ b/app/Http/Admin/Views/point_gift_redeem/list.volt @@ -46,14 +46,14 @@

物品名称：{{ item.gift_name }}（{{ item.gift_id }}）

-

物品类型：{{ gift_type_info(item.gift_type) }}

+

物品类型：{{ gift_type(item.gift_type) }}

用户名称：{{ item.user_name }}（{{ item.user_id }}）

联系方式：查看

{{ item.gift_point }} - {{ redeem_status_info(item.status) }} + {{ redeem_status(item.status) }} {{ date('Y-m-d H:i:s',item.create_time) }} {% if item.gift_type == 2 %} diff --git a/app/Http/Home/Controllers/PointController.php b/app/Http/Home/Controllers/PointController.php new file mode 100644 index 00000000..901ae617 --- /dev/null +++ b/app/Http/Home/Controllers/PointController.php @@ -0,0 +1,30 @@ +getSettings('point'); + + $consumeRule = json_decode($point['consume_rule']); + $eventRule = json_decode($point['event_rule']); + + $this->view->setVar('consume_rule', $consumeRule); + $this->view->setVar('event_rule', $eventRule); + } + +} diff --git a/app/Http/Home/Controllers/PointGiftController.php b/app/Http/Home/Controllers/PointGiftController.php index a53489fa..dac85a45 100644 --- a/app/Http/Home/Controllers/PointGiftController.php +++ b/app/Http/Home/Controllers/PointGiftController.php @@ -38,7 +38,9 @@ class PointGiftController extends Controller */ public function listAction() { - $this->seo->prependTitle('积分兑换'); + $this->seo->prependTitle('积分商城'); + + $this->view->pick('point/gift/list'); } /** @@ -53,6 +55,7 @@ class PointGiftController extends Controller $pager->target = 'gift-list'; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('point/gift/pager'); $this->view->setVar('pager', $pager); } @@ -78,6 +81,7 @@ class PointGiftController extends Controller $this->seo->prependTitle(['积分兑换', $gift['name']]); + $this->view->pick('point/gift/show'); $this->view->setVar('gift', $gift); $this->view->setVar('hot_gifts', $hotGifts); $this->view->setVar('user_balance', $userBalance); diff --git a/app/Http/Home/Views/article/list.volt b/app/Http/Home/Views/article/list.volt index bcc3bfc2..aced081e 100644 --- a/app/Http/Home/Views/article/list.volt +++ b/app/Http/Home/Views/article/list.volt @@ -14,7 +14,7 @@
-
+
diff --git a/app/Http/Home/Views/article/show.volt b/app/Http/Home/Views/article/show.volt index f0ff849c..2c40feb6 100644 --- a/app/Http/Home/Views/article/show.volt +++ b/app/Http/Home/Views/article/show.volt @@ -25,10 +25,7 @@
-
-
- {{ partial('article/sticky') }} -
+
{{ article.title }}
@@ -97,6 +94,10 @@
+
+ {{ partial('article/sticky') }} +
+ {% set share_url = full_url({'for':'home.share'},{'id':article.id,'type':'article'}) %} {% set qrcode_url = url({'for':'home.qrcode'},{'text':share_url}) %} diff --git a/app/Http/Home/Views/article/show_owner.volt b/app/Http/Home/Views/article/show_owner.volt index d03ac5d3..1987886e 100644 --- a/app/Http/Home/Views/article/show_owner.volt +++ b/app/Http/Home/Views/article/show_owner.volt @@ -1,7 +1,7 @@
关于作者
-
+
{{ article.owner.name }}
diff --git a/app/Http/Home/Views/chapter/live/active.volt b/app/Http/Home/Views/chapter/live/active.volt index 663240e9..fdbb1946 100644 --- a/app/Http/Home/Views/chapter/live/active.volt +++ b/app/Http/Home/Views/chapter/live/active.volt @@ -22,9 +22,6 @@
-
- {{ partial('chapter/live/sticky') }} -
@@ -48,6 +45,10 @@
+
+ {{ partial('chapter/live/sticky') }} +
+
diff --git a/app/Http/Home/Views/chapter/read.volt b/app/Http/Home/Views/chapter/read.volt index 1e608c73..534d3f38 100644 --- a/app/Http/Home/Views/chapter/read.volt +++ b/app/Http/Home/Views/chapter/read.volt @@ -16,10 +16,7 @@
-
-
- {{ partial('chapter/sticky') }} -
+
{{ chapter.title }}
@@ -37,6 +34,10 @@
+
+ {{ partial('chapter/sticky') }} +
+
diff --git a/app/Http/Home/Views/chapter/vod.volt b/app/Http/Home/Views/chapter/vod.volt index 1b054626..cc7e9df4 100644 --- a/app/Http/Home/Views/chapter/vod.volt +++ b/app/Http/Home/Views/chapter/vod.volt @@ -17,10 +17,7 @@
-
-
- {{ partial('chapter/sticky') }} -
+
@@ -35,6 +32,10 @@
+
+ {{ partial('chapter/sticky') }} +
+
diff --git a/app/Http/Home/Views/comment/info.volt b/app/Http/Home/Views/comment/info.volt index 0a6249c1..3515c94c 100644 --- a/app/Http/Home/Views/comment/info.volt +++ b/app/Http/Home/Views/comment/info.volt @@ -32,7 +32,7 @@ {% endif %} {% if comment.parent_id > 0 %} -
+
{{ comment.owner.name }} diff --git a/app/Http/Home/Views/consult/show.volt b/app/Http/Home/Views/consult/show.volt index b9b6d0d5..d2d1fe11 100644 --- a/app/Http/Home/Views/consult/show.volt +++ b/app/Http/Home/Views/consult/show.volt @@ -6,22 +6,22 @@
{% if consult.course.id is defined %} -
+
课程：
{{ consult.course.title }}
{% endif %} {% if consult.chapter.id is defined %} -
+
章节：
{{ consult.chapter.title }}
{% endif %} -
+
咨询：
{{ consult.question }}
-
+
回复：
{{ consult.answer }}
diff --git a/app/Http/Home/Views/course/packages.volt b/app/Http/Home/Views/course/packages.volt index ecabee5d..d8d21017 100644 --- a/app/Http/Home/Views/course/packages.volt +++ b/app/Http/Home/Views/course/packages.volt @@ -1,7 +1,7 @@
{% for package in packages %} {% set order_url = url({'for':'home.order.confirm'},{'item_id':package.id,'item_type':2}) %} -
+
{{ package.title }}
diff --git a/app/Http/Home/Views/course/pager.volt b/app/Http/Home/Views/course/pager.volt index 75a7f5cc..28f1ee17 100644 --- a/app/Http/Home/Views/course/pager.volt +++ b/app/Http/Home/Views/course/pager.volt @@ -1,7 +1,7 @@ {{ partial('macros/course') }} {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %}
diff --git a/app/Http/Home/Views/course/show.volt b/app/Http/Home/Views/course/show.volt index eeba26a8..5d429389 100644 --- a/app/Http/Home/Views/course/show.volt +++ b/app/Http/Home/Views/course/show.volt @@ -19,11 +19,7 @@ {{ partial('course/show_meta') }} -
- -
- {{ partial('course/sticky') }} -
+
{% set show_tab_chapters = course.lesson_count > 0 %} {% set show_tab_packages = course.package_count > 0 %} @@ -93,6 +89,10 @@
+
+ {{ partial('course/sticky') }} +
+ {% set share_url = full_url({'for':'home.share'},{'id':course.id,'type':'course'}) %} {% set qrcode_url = url({'for':'home.qrcode'},{'text':share_url}) %} diff --git a/app/Http/Home/Views/course/show_catalog.volt b/app/Http/Home/Views/course/show_catalog.volt index e7ed78b3..81bce59a 100644 --- a/app/Http/Home/Views/course/show_catalog.volt +++ b/app/Http/Home/Views/course/show_catalog.volt @@ -97,13 +97,13 @@
    {% for lesson in chapter.children %} {% if lesson.model == 1 %} -
  • {{ vod_lesson_info(lesson) }}
    • +
  • {{ vod_lesson_info(lesson) }}
    • {% elseif lesson.model == 2 %} -
  • {{ live_lesson_info(lesson) }}
    • +
  • {{ live_lesson_info(lesson) }}
    • {% elseif lesson.model == 3 %} -
  • {{ read_lesson_info(lesson) }}
    • +
  • {{ read_lesson_info(lesson) }}
    • {% elseif lesson.model == 4 %} -
  • {{ offline_lesson_info(lesson) }}
    • +
  • {{ offline_lesson_info(lesson) }}
    • {% endif %} {% endfor %}
diff --git a/app/Http/Home/Views/course/show_meta.volt b/app/Http/Home/Views/course/show_meta.volt index a0d37b9a..ff79b74d 100644 --- a/app/Http/Home/Views/course/show_meta.volt +++ b/app/Http/Home/Views/course/show_meta.volt @@ -61,12 +61,8 @@ {%- macro meta_price_info(course) %}

- {% if course.origin_price > 0 %} - 原始价格 - {{ '￥%0.2f'|format(course.origin_price) }} - {% endif %} {% if course.market_price > 0 %} - 优惠价格 + 市场价格 {{ '￥%0.2f'|format(course.market_price) }} {% else %} 优惠价格 @@ -93,7 +89,7 @@

{%- endmacro %} -
+
{{ model_type(course.model) }} {{ course.title }} diff --git a/app/Http/Home/Views/course/show_teacher.volt b/app/Http/Home/Views/course/show_teacher.volt index 0f4db10e..cbe0dfc3 100644 --- a/app/Http/Home/Views/course/show_teacher.volt +++ b/app/Http/Home/Views/course/show_teacher.volt @@ -5,7 +5,7 @@
{% for teacher in course.teachers %} {% set teacher_url = url({'for':'home.user.show','id':teacher.id}) %} -
+
{{ teacher.name }}
diff --git a/app/Http/Home/Views/flash_sale/index.volt b/app/Http/Home/Views/flash_sale/index.volt index 63296cee..b0dde38f 100644 --- a/app/Http/Home/Views/flash_sale/index.volt +++ b/app/Http/Home/Views/flash_sale/index.volt @@ -131,7 +131,7 @@ {% for item in date_sale.items %} {% set class = item.selected == 1 ? 'layui-tab-item layui-show' : 'layui-tab-item' %}
-
+
{% for sale in item.items %}
diff --git a/app/Http/Home/Views/help/show.volt b/app/Http/Home/Views/help/show.volt index fde9bf69..0ccb2c8a 100644 --- a/app/Http/Home/Views/help/show.volt +++ b/app/Http/Home/Views/help/show.volt @@ -12,7 +12,7 @@
-
+
{{ help.content }}
diff --git a/app/Http/Home/Views/index/full.volt b/app/Http/Home/Views/index/full.volt index 2879f5fd..977abd9b 100644 --- a/app/Http/Home/Views/index/full.volt +++ b/app/Http/Home/Views/index/full.volt @@ -16,7 +16,7 @@ {% for item in items %} {% set class = loop.first ? 'layui-tab-item layui-show' : 'layui-tab-item' %}
-
+
{% for course in item.courses %}
diff --git a/app/Http/Home/Views/index/simple.volt b/app/Http/Home/Views/index/simple.volt index ac0c578d..6c1ff722 100644 --- a/app/Http/Home/Views/index/simple.volt +++ b/app/Http/Home/Views/index/simple.volt @@ -5,7 +5,7 @@ {{ partial('macros/course') }} {%- macro show_courses(courses) %} -
+
{% for course in courses %}
diff --git a/app/Http/Home/Views/macros/course.volt b/app/Http/Home/Views/macros/course.volt index 0c270095..704a4564 100644 --- a/app/Http/Home/Views/macros/course.volt +++ b/app/Http/Home/Views/macros/course.volt @@ -70,7 +70,7 @@ {%- macro sidebar_course_card(course) %} {% set course_url = url({'for':'home.course.show','id':course.id}) %} -
+
{{ course.title }}
diff --git a/app/Http/Home/Views/macros/point_gift.volt b/app/Http/Home/Views/macros/point_gift.volt index 9f6e695a..9a260161 100644 --- a/app/Http/Home/Views/macros/point_gift.volt +++ b/app/Http/Home/Views/macros/point_gift.volt @@ -1,4 +1,4 @@ -{%- macro gift_type_info(value) %} +{%- macro gift_type(value) %} {% if value == 1 %} 课程 {% elseif value == 2 %} @@ -8,7 +8,7 @@ {% endif %} {%- endmacro %} -{%- macro redeem_status_info(value) %} +{%- macro redeem_status(value) %} {% if value == 1 %} 处理中 {% elseif value == 2 %} diff --git a/app/Http/Home/Views/macros/point_history.volt b/app/Http/Home/Views/macros/point_history.volt index b1447b66..95d167bb 100644 --- a/app/Http/Home/Views/macros/point_history.volt +++ b/app/Http/Home/Views/macros/point_history.volt @@ -1,8 +1,8 @@ {%- macro event_point_info(value) %} {% if value > 0 %} - +{{ value }} + +{{ value }} {% else %} - {{ value }} + {{ value }} {% endif %} {%- endmacro %} @@ -37,6 +37,8 @@ 提问被赞 {% elseif value == 15 %} 回答被赞 + {% else %} + N/A {% endif %} {%- endmacro %} @@ -83,5 +85,7 @@ {% elseif type == 15 %} {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}

{{ info.question.title }}

+ {% else %} +

N/A

{% endif %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/order/confirm.volt b/app/Http/Home/Views/order/confirm.volt index 3d2f7d14..88bb5c7f 100644 --- a/app/Http/Home/Views/order/confirm.volt +++ b/app/Http/Home/Views/order/confirm.volt @@ -6,14 +6,14 @@ {%- macro cart_course_card(course, user) %} {% set course_url = url({'for':'home.course.show','id':course.id}) %} -
+
{{ course.title }}

{{ course.title }}

- 优惠价格 + 市场价格 {{ '￥%0.2f'|format(course.market_price) }} 会员价格 {{ '￥%0.2f'|format(course.vip_price) }} @@ -46,7 +46,7 @@ {% set course = item_info.course %} {% set reward = item_info.reward %} {% set course_url = url({'for':'home.course.show','id':course.id}) %} -

+
{{ course.title }}
@@ -70,7 +70,7 @@ {%- macro cart_vip_card(item_info) %} {% set vip = item_info.vip %} -
+
{{ vip.title }}
@@ -109,7 +109,7 @@ {% endif %}
-
+
商品总价：{{ '￥%0.2f'|format(confirm.total_amount) }} 优惠金额：{{ '￥%0.2f'|format(confirm.discount_amount) }} diff --git a/app/Http/Home/Views/page/show.volt b/app/Http/Home/Views/page/show.volt index 1b38c8fd..1a7f6af4 100644 --- a/app/Http/Home/Views/page/show.volt +++ b/app/Http/Home/Views/page/show.volt @@ -11,7 +11,7 @@
-
+
{{ page.content }}
diff --git a/app/Http/Home/Views/point_gift/list.volt b/app/Http/Home/Views/point/gift/list.volt similarity index 100% rename from app/Http/Home/Views/point_gift/list.volt rename to app/Http/Home/Views/point/gift/list.volt diff --git a/app/Http/Home/Views/point_gift/pager.volt b/app/Http/Home/Views/point/gift/pager.volt similarity index 89% rename from app/Http/Home/Views/point_gift/pager.volt rename to app/Http/Home/Views/point/gift/pager.volt index 77ced7f3..18a0168d 100644 --- a/app/Http/Home/Views/point_gift/pager.volt +++ b/app/Http/Home/Views/point/gift/pager.volt @@ -1,12 +1,13 @@ {{ partial('macros/point_gift') }} {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set gift_url = url({'for':'home.point_gift.show','id':item.id}) %}
+ {{ gift_type(item.type) }}
item.name @@ -17,7 +18,6 @@ {{ item.name }}
- {{ gift_type_info(item.type) }} {{ item.point }} 积分 {{ item.redeem_count }} 人兑换
diff --git a/app/Http/Home/Views/point_gift/show.volt b/app/Http/Home/Views/point/gift/show.volt similarity index 78% rename from app/Http/Home/Views/point_gift/show.volt rename to app/Http/Home/Views/point/gift/show.volt index fd845197..68ef0052 100644 --- a/app/Http/Home/Views/point_gift/show.volt +++ b/app/Http/Home/Views/point/gift/show.volt @@ -15,14 +15,14 @@
-
+
物品信息
-
+
- {{ gift_type_info(gift.type) }} + {{ gift_type(gift.type) }} {{ gift.name }}
@@ -62,34 +62,34 @@
-
我的信息
+
物品兑换
-
-
- {{ auth_user.name }} +
+
+
+ 我的积分：{{ user_balance.point }} 积分 +
-
-
{{ auth_user.name }}
-
当前积分{{ user_balance.point }}
-
-
+ {% if gift.me.allow_redeem == 1 %} +
+ +
+ {% else %} +
+ +
+ {% endif %} +
-
- {% if gift.me.allow_redeem == 1 %} - - {% else %} - - {% endif %} -
热门兑换
{% for gift in hot_gifts %} {% set gift_url = url({'for':'home.point_gift.show','id':gift.id}) %} -
+
{{ gift.name }} diff --git a/app/Http/Home/Views/point/rule.volt b/app/Http/Home/Views/point/rule.volt new file mode 100644 index 00000000..0b1f224f --- /dev/null +++ b/app/Http/Home/Views/point/rule.volt @@ -0,0 +1,106 @@ +{% extends 'templates/layer.volt' %} + +{% block content %} + + + + + + + + + + + + + + + + {% if consume_rule.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.account_register.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.site_visit.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.course_review.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.chapter_study.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.comment_post.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.article_post.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.question_post.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.answer_post.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.article_liked.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.question_liked.enabled == 1 %} + + + + + + {% endif %} + {% if event_rule.answer_liked.enabled == 1 %} + + + + + + {% endif %} + +
奖励类型奖励分值每日上限
订单消费消费金额 X {{ consume_rule.rate }}N/A
帐号注册{{ event_rule.account_register.point }}N/A
站点访问{{ event_rule.site_visit.point }}N/A
课程评价{{ event_rule.course_review.point }}N/A
课时学习{{ event_rule.chapter_study.point }}N/A
发表评论{{ event_rule.comment_post.point }}{{ event_rule.comment_post.limit }}
发表文章{{ event_rule.article_post.point }}{{ event_rule.article_post.limit }}
发布问题{{ event_rule.question_post.point }}{{ event_rule.article_post.limit }}
回答问题{{ event_rule.answer_post.point }}{{ event_rule.article_post.limit }}
文章被赞{{ event_rule.article_liked.point }}{{ event_rule.article_post.limit }}
问题被赞{{ event_rule.question_liked.point }}{{ event_rule.article_post.limit }}
回答被赞{{ event_rule.answer_liked.point }}{{ event_rule.article_post.limit }}
+ +{% endblock %} \ No newline at end of file diff --git a/app/Http/Home/Views/question/list.volt b/app/Http/Home/Views/question/list.volt index 626f8e8b..a6d0d3ab 100644 --- a/app/Http/Home/Views/question/list.volt +++ b/app/Http/Home/Views/question/list.volt @@ -15,7 +15,7 @@
-
+
diff --git a/app/Http/Home/Views/question/show.volt b/app/Http/Home/Views/question/show.volt index ce3eb7a2..20fdc48c 100644 --- a/app/Http/Home/Views/question/show.volt +++ b/app/Http/Home/Views/question/show.volt @@ -28,10 +28,7 @@
-
-
- {{ partial('question/sticky') }} -
+
{{ question.title }}
@@ -97,6 +94,10 @@
+
+ {{ partial('question/sticky') }} +
+ {% set share_url = full_url({'for':'home.share'},{'id':question.id,'type':'question'}) %} {% set qrcode_url = url({'for':'home.qrcode'},{'text':share_url}) %} diff --git a/app/Http/Home/Views/question/show_owner.volt b/app/Http/Home/Views/question/show_owner.volt index f5620808..7ed38536 100644 --- a/app/Http/Home/Views/question/show_owner.volt +++ b/app/Http/Home/Views/question/show_owner.volt @@ -1,7 +1,7 @@
关于作者
-
+
{{ question.owner.name }}
diff --git a/app/Http/Home/Views/search/index.volt b/app/Http/Home/Views/search/index.volt index d589ad37..e890f85f 100644 --- a/app/Http/Home/Views/search/index.volt +++ b/app/Http/Home/Views/search/index.volt @@ -15,7 +15,7 @@
{% set tab_show = type %} -
+
diff --git a/app/Http/Home/Views/tag/list_pager.volt b/app/Http/Home/Views/tag/list_pager.volt index 3d5c5dfe..97c09d4d 100644 --- a/app/Http/Home/Views/tag/list_pager.volt +++ b/app/Http/Home/Views/tag/list_pager.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set follow_url = url({'for':'home.tag.follow','id':item.id}) %} diff --git a/app/Http/Home/Views/tag/my_pager.volt b/app/Http/Home/Views/tag/my_pager.volt index 4dae1e45..4a8c1efa 100644 --- a/app/Http/Home/Views/tag/my_pager.volt +++ b/app/Http/Home/Views/tag/my_pager.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set follow_url = url({'for':'home.tag.follow','id':item.id}) %} diff --git a/app/Http/Home/Views/teacher/console/consults.volt b/app/Http/Home/Views/teacher/console/consults.volt index b201cbd0..d024bb4c 100644 --- a/app/Http/Home/Views/teacher/console/consults.volt +++ b/app/Http/Home/Views/teacher/console/consults.volt @@ -7,7 +7,7 @@ {% set status_types = {'all':'全部','pending':'待回复','replied':'已回复'} %} {% set status = request.get('status','trim','all') %} -
+
{{ partial('teacher/console/menu') }}
@@ -20,7 +20,7 @@ {% endfor %}
{% if pager.total_pages > 0 %} - +
diff --git a/app/Http/Home/Views/teacher/console/courses.volt b/app/Http/Home/Views/teacher/console/courses.volt index 4f621c89..ac6f76ee 100644 --- a/app/Http/Home/Views/teacher/console/courses.volt +++ b/app/Http/Home/Views/teacher/console/courses.volt @@ -4,7 +4,7 @@ {{ partial('macros/course') }} -
+
{{ partial('teacher/console/menu') }}
@@ -12,7 +12,7 @@ 我的课程
{% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/teacher/console/lives.volt b/app/Http/Home/Views/teacher/console/lives.volt index 0cf15df1..215d0387 100644 --- a/app/Http/Home/Views/teacher/console/lives.volt +++ b/app/Http/Home/Views/teacher/console/lives.volt @@ -4,7 +4,7 @@ {{ partial('macros/course') }} -
+
{{ partial('teacher/console/menu') }}
@@ -12,7 +12,7 @@ 课程直播
{% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/teacher/pager.volt b/app/Http/Home/Views/teacher/pager.volt index d2275f38..65e9974a 100644 --- a/app/Http/Home/Views/teacher/pager.volt +++ b/app/Http/Home/Views/teacher/pager.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set user_url = url({'for':'home.teacher.show','id':item.id}) %} @@ -14,9 +14,6 @@ {{ item.name }}
{{ item.title|default('小小教书匠') }}
-
- 添加好友 -
{% endfor %} diff --git a/app/Http/Home/Views/topic/courses.volt b/app/Http/Home/Views/topic/courses.volt index 7478412f..b139f875 100644 --- a/app/Http/Home/Views/topic/courses.volt +++ b/app/Http/Home/Views/topic/courses.volt @@ -1,7 +1,7 @@ {{ partial('macros/course') }} {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %}
diff --git a/app/Http/Home/Views/user/console/account_email.volt b/app/Http/Home/Views/user/console/account_email.volt index 36d1a793..0f549223 100644 --- a/app/Http/Home/Views/user/console/account_email.volt +++ b/app/Http/Home/Views/user/console/account_email.volt @@ -2,7 +2,7 @@ {% block content %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/account_info.volt b/app/Http/Home/Views/user/console/account_info.volt index bf5ae2bb..8ccd7cb5 100644 --- a/app/Http/Home/Views/user/console/account_info.volt +++ b/app/Http/Home/Views/user/console/account_info.volt @@ -23,7 +23,7 @@ {% set edit_phone_url = url({'for':'home.uc.account'},{'type':'phone'}) %} {% set edit_email_url = url({'for':'home.uc.account'},{'type':'email'}) %} -
+
{{ partial('user/console/menu') }}
@@ -32,32 +32,42 @@
- - 登录密码 - 经常更改密码有助于保护您的帐号安全 - 修改 +
+ + 登录密码 + 经常更改密码有助于保护您的帐号安全 +
+
+ 修改 +
- - 手机绑定 - {% if account.phone %} - 已绑定手机：{{ account.phone|anonymous }} - 修改 - {% else %} - 可用于登录和重置密码 - 绑定 - {% endif %} +
+ + 手机绑定 + {% if account.phone %} + 已绑定手机：{{ account.phone|anonymous }} + {% else %} + 可用于登录和重置密码 + {% endif %} +
+
+ 绑定 +
- - 邮箱绑定 - {% if account.email %} - 已绑定邮箱：{{ account.email|anonymous }} - 修改 - {% else %} - 可用于登录和重置密码 - 绑定 - {% endif %} +
+ + 邮箱绑定 + {% if account.email %} + 已绑定邮箱：{{ account.email|anonymous }} + {% else %} + 可用于登录和重置密码 + {% endif %} +
+
+ 绑定 +
@@ -66,19 +76,20 @@ {% if connects %}
已经绑定的第三方帐号
-
+
- + {% for connect in connects %} {% set url = url({'for':'home.uc.unconnect','id':connect.id}) %} + {% set time = connect.update_time > 0 ? connect.update_time : connect.create_time %} - + {% endfor %} diff --git a/app/Http/Home/Views/user/console/account_password.volt b/app/Http/Home/Views/user/console/account_password.volt index ee187402..49c4adf6 100644 --- a/app/Http/Home/Views/user/console/account_password.volt +++ b/app/Http/Home/Views/user/console/account_password.volt @@ -2,7 +2,7 @@ {% block content %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/account_phone.volt b/app/Http/Home/Views/user/console/account_phone.volt index 67e90edd..f2475cd2 100644 --- a/app/Http/Home/Views/user/console/account_phone.volt +++ b/app/Http/Home/Views/user/console/account_phone.volt @@ -2,7 +2,7 @@ {% block content %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/answers.volt b/app/Http/Home/Views/user/console/answers.volt index bd011266..c65a744a 100644 --- a/app/Http/Home/Views/user/console/answers.volt +++ b/app/Http/Home/Views/user/console/answers.volt @@ -7,7 +7,7 @@ {% set published_types = {'0':'全部','1':'审核中','2':'已发布','3':'未通过'} %} {% set published = request.get('published','trim','0') %} -
+
{{ partial('user/console/menu') }}
@@ -20,7 +20,7 @@ {% endfor %}
{% if pager.total_pages > 0 %} -
提供方 用户信息创建日期更新日期 操作
{{ connect_provider(connect) }} {{ connect_user(connect) }}{{ date('Y-m-d H:i',connect.create_time) }}{{ date('Y-m-d H:i',time) }} 解绑
+
diff --git a/app/Http/Home/Views/user/console/articles.volt b/app/Http/Home/Views/user/console/articles.volt index 51049304..be40a082 100644 --- a/app/Http/Home/Views/user/console/articles.volt +++ b/app/Http/Home/Views/user/console/articles.volt @@ -7,7 +7,7 @@ {% set published_types = {'0':'全部','1':'审核中','2':'已发布','3':'未通过'} %} {% set published = request.get('published','trim','0') %} -
+
{{ partial('user/console/menu') }}
@@ -20,7 +20,7 @@ {% endfor %}
{% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/user/console/consults.volt b/app/Http/Home/Views/user/console/consults.volt index a0f6056d..c9cc93c3 100644 --- a/app/Http/Home/Views/user/console/consults.volt +++ b/app/Http/Home/Views/user/console/consults.volt @@ -4,7 +4,7 @@ {{ partial('macros/course') }} -
+
{{ partial('user/console/menu') }}
@@ -12,7 +12,7 @@ 我的咨询
{% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/user/console/contact.volt b/app/Http/Home/Views/user/console/contact.volt index fa129d27..ebd0ef66 100644 --- a/app/Http/Home/Views/user/console/contact.volt +++ b/app/Http/Home/Views/user/console/contact.volt @@ -4,7 +4,7 @@ {% set update_url = url({'for':'home.uc.update_contact'}) %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/courses.volt b/app/Http/Home/Views/user/console/courses.volt index 5374dfc2..0f3bbe1a 100644 --- a/app/Http/Home/Views/user/console/courses.volt +++ b/app/Http/Home/Views/user/console/courses.volt @@ -5,7 +5,7 @@ {{ partial('macros/course_user') }} {{ partial('macros/course') }} -
+
{{ partial('user/console/menu') }}
@@ -13,7 +13,7 @@ 我的课程
{% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/user/console/favorites.volt b/app/Http/Home/Views/user/console/favorites.volt index 4c67244a..09db7f85 100644 --- a/app/Http/Home/Views/user/console/favorites.volt +++ b/app/Http/Home/Views/user/console/favorites.volt @@ -5,7 +5,7 @@ {% set types = {'course':'课程','article':'文章','question':'问题'} %} {% set type = request.get('type','trim','course') %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/favorites_article.volt b/app/Http/Home/Views/user/console/favorites_article.volt index 0a8a8e50..b2586e7c 100644 --- a/app/Http/Home/Views/user/console/favorites_article.volt +++ b/app/Http/Home/Views/user/console/favorites_article.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/user/console/favorites_course.volt b/app/Http/Home/Views/user/console/favorites_course.volt index d2891471..0f1da6fa 100644 --- a/app/Http/Home/Views/user/console/favorites_course.volt +++ b/app/Http/Home/Views/user/console/favorites_course.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/user/console/favorites_question.volt b/app/Http/Home/Views/user/console/favorites_question.volt index 0a7b870d..d2f74582 100644 --- a/app/Http/Home/Views/user/console/favorites_question.volt +++ b/app/Http/Home/Views/user/console/favorites_question.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
diff --git a/app/Http/Home/Views/user/console/menu.volt b/app/Http/Home/Views/user/console/menu.volt index 2133cf54..8f80df14 100644 --- a/app/Http/Home/Views/user/console/menu.volt +++ b/app/Http/Home/Views/user/console/menu.volt @@ -63,16 +63,6 @@ {% endif %} -
-
聊天设置
-
- -
-
-
个人设置
diff --git a/app/Http/Home/Views/user/console/notifications.volt b/app/Http/Home/Views/user/console/notifications.volt index a5e4a83b..f38ba65e 100644 --- a/app/Http/Home/Views/user/console/notifications.volt +++ b/app/Http/Home/Views/user/console/notifications.volt @@ -4,7 +4,7 @@ {{ partial('macros/notification') }} -
+
{{ partial('user/console/menu') }}
@@ -15,7 +15,7 @@ {% for item in pager.items %} {% set sender_url = url({'for':'home.user.show','id':item.sender.id}) %} {% set receiver_url = url({'for':'home.user.show','id':item.receiver.id}) %} -
+
{{ item.sender.name }} diff --git a/app/Http/Home/Views/user/console/orders.volt b/app/Http/Home/Views/user/console/orders.volt index d43233e9..783cebc6 100644 --- a/app/Http/Home/Views/user/console/orders.volt +++ b/app/Http/Home/Views/user/console/orders.volt @@ -7,7 +7,7 @@ {% set status_types = {'0':'全部','1':'待支付','3':'已完成','4':'已关闭','5':'已退款'} %} {% set status = request.get('status','trim','0') %} -
+
{{ partial('user/console/menu') }}
@@ -20,28 +20,44 @@ {% endfor %}
{% if pager.total_pages > 0 %} -
+
+ + + + + + + + + + + + + + + + + {% for item in pager.items %} {% set order_info_url = url({'for':'home.order.info'},{'sn':item.sn}) %} -
-
- 编号：{{ item.sn }} - 时间：{{ date('Y-m-d H:i:s',item.create_time) }} - {% if item.promotion_type > 0 %} - 促销：{{ promotion_type(item.promotion_type) }} - {% endif %} -
-
-
{{ item.subject }}
-
{{ '￥%0.2f'|format(item.amount) }}
-
{{ order_status(item.status) }}
-
- -
-
-
+ + + + + + + {% endfor %} - + +
商品促销价格状态操作
+

{{ item.subject }}

+

+ 编号：{{ item.sn }} + 时间：{{ date('Y-m-d',item.create_time) }} +

+ 		{{ promotion_type(item.promotion_type) }}{{ '￥%0.2f'|format(item.amount) }}{{ order_status(item.status) }} + +
{{ partial('partials/pager') }} {% endif %}
diff --git a/app/Http/Home/Views/user/console/point_gift_redeems.volt b/app/Http/Home/Views/user/console/point_gift_redeems.volt index 5594d13c..ca698a76 100644 --- a/app/Http/Home/Views/user/console/point_gift_redeems.volt +++ b/app/Http/Home/Views/user/console/point_gift_redeems.volt @@ -4,7 +4,7 @@ {{ partial('macros/point_gift') }} -
+
{{ partial('user/console/menu') }}
@@ -12,7 +12,7 @@ 兑换记录
{% if pager.total_pages > 0 %} - +
@@ -31,9 +31,9 @@ {% for item in pager.items %} {% set gift_url = url({'for':'home.point_gift.show','id':item.gift.id}) %} - + - + {% endfor %} diff --git a/app/Http/Home/Views/user/console/point_history.volt b/app/Http/Home/Views/user/console/point_history.volt index aa366671..751bf2af 100644 --- a/app/Http/Home/Views/user/console/point_history.volt +++ b/app/Http/Home/Views/user/console/point_history.volt @@ -4,15 +4,18 @@ {{ partial('macros/point_history') }} -
+ {% set rule_url = url({'for':'home.point.rule'}) %} + +
{{ partial('user/console/menu') }}
积分记录 + 积分规则
{% if pager.total_pages > 0 %} -
{{ item.gift.name }} {{ gift_type_info(item.gift.type) }}{{ item.gift.name }} {{ gift_type(item.gift.type) }} {{ item.gift.point }}{{ redeem_status_info(item.status) }}{{ redeem_status(item.status) }} {{ date('Y-m-d',item.create_time) }}
+
@@ -33,7 +36,7 @@ - + {% endfor %} @@ -44,4 +47,10 @@ +{% endblock %} + +{% block include_js %} + + {{ js_include('home/js/point.rule.js') }} + {% endblock %} \ No newline at end of file diff --git a/app/Http/Home/Views/user/console/profile.volt b/app/Http/Home/Views/user/console/profile.volt index cbf2a6c8..f52f8ab7 100644 --- a/app/Http/Home/Views/user/console/profile.volt +++ b/app/Http/Home/Views/user/console/profile.volt @@ -7,7 +7,7 @@ {% set gender_female_checked = user.gender == 2 ? 'checked' : '' %} {% set gender_none_checked = user.gender == 3 ? 'checked' : '' %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/questions.volt b/app/Http/Home/Views/user/console/questions.volt index c0a0665b..6f6736ca 100644 --- a/app/Http/Home/Views/user/console/questions.volt +++ b/app/Http/Home/Views/user/console/questions.volt @@ -7,7 +7,7 @@ {% set published_types = {'0':'全部','1':'审核中','2':'已发布','3':'未通过'} %} {% set published = request.get('published','trim','0') %} -
+
{{ partial('user/console/menu') }}
@@ -20,7 +20,7 @@ {% endfor %}
{% if pager.total_pages > 0 %} -
{{ event_type_info(item.event_type) }} {{ event_point_info(item.event_point) }} {{ event_detail_info(item.event_type,item.event_info) }}{{ date('Y-m-d',item.create_time) }}{{ date('Y-m-d H:i',item.create_time) }}
+
diff --git a/app/Http/Home/Views/user/console/refunds.volt b/app/Http/Home/Views/user/console/refunds.volt index 429477da..0c6455d3 100644 --- a/app/Http/Home/Views/user/console/refunds.volt +++ b/app/Http/Home/Views/user/console/refunds.volt @@ -7,7 +7,7 @@ {% set status_types = {'0':'全部','1':'待处理','2':'已取消','3':'退款中','5':'已完成'} %} {% set status = request.get('status','int','0') %} -
+
{{ partial('user/console/menu') }}
@@ -20,25 +20,41 @@ {% endfor %}
{% if pager.total_pages > 0 %} -
+
+ + + + + + + + + + + + + + + {% for item in pager.items %} {% set refund_info_url = url({'for':'home.refund.info'},{'sn':item.sn}) %} -
-
- 编号：{{ item.sn }} - 时间：{{ date('Y-m-d H:i:s',item.create_time) }} -
-
-
{{ item.subject }}
-
{{ '￥%0.2f'|format(item.amount) }}
-
{{ refund_status(item.status) }}
-
- -
-
-
+ + + + + + {% endfor %} - + +
商品价格状态操作
+

{{ item.subject }}

+

+ 编号：{{ item.sn }} + 时间：{{ date('Y-m-d',item.create_time) }} +

+ 		{{ '￥%0.2f'|format(item.amount) }}{{ refund_status(item.status) }} + +
{{ partial('partials/pager') }} {% endif %}
diff --git a/app/Http/Home/Views/user/console/reviews.volt b/app/Http/Home/Views/user/console/reviews.volt index f52518a4..49b6be80 100644 --- a/app/Http/Home/Views/user/console/reviews.volt +++ b/app/Http/Home/Views/user/console/reviews.volt @@ -4,7 +4,7 @@ {{ partial('macros/course') }} -
+
{{ partial('user/console/menu') }}
@@ -12,7 +12,7 @@ 我的评价
{% if pager.total_pages > 0 %} - +
diff --git a/app/Http/Home/Views/user/console/subscribe.volt b/app/Http/Home/Views/user/console/subscribe.volt index 1fe6a2c7..196cf83e 100644 --- a/app/Http/Home/Views/user/console/subscribe.volt +++ b/app/Http/Home/Views/user/console/subscribe.volt @@ -2,7 +2,7 @@ {% block content %} -
+
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/courses.volt b/app/Http/Home/Views/user/courses.volt index 386ab5e8..2bcbe426 100644 --- a/app/Http/Home/Views/user/courses.volt +++ b/app/Http/Home/Views/user/courses.volt @@ -1,7 +1,7 @@ {{ partial('macros/course') }} {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %}
diff --git a/app/Http/Home/Views/user/show.volt b/app/Http/Home/Views/user/show.volt index 9495d241..0f4517cb 100644 --- a/app/Http/Home/Views/user/show.volt +++ b/app/Http/Home/Views/user/show.volt @@ -20,7 +20,7 @@
-