diff --git a/app/Http/Admin/Views/refund/macro.volt b/app/Http/Admin/Views/refund/macro.volt index 6320281f..0208de49 100644 --- a/app/Http/Admin/Views/refund/macro.volt +++ b/app/Http/Admin/Views/refund/macro.volt @@ -12,22 +12,4 @@ {% elseif value == 6 %} 已失败 {% endif %} -{%- endmacro %} - -{%- macro refund_status_history(items) %} - {% for item in items %} - {% if item.status == 1 %} -
创建时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 2 %} -取消时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 3 %} -过审时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 4 %} -拒绝时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 5 %} -完成时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 6 %} -失败时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% endif %} - {% endfor %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Admin/Views/trade/macro.volt b/app/Http/Admin/Views/trade/macro.volt index 331f7ad3..38ec2095 100644 --- a/app/Http/Admin/Views/trade/macro.volt +++ b/app/Http/Admin/Views/trade/macro.volt @@ -16,18 +16,4 @@ {% elseif value == 4 %} 已退款 {% endif %} -{%- endmacro %} - -{%- macro trade_status_history(items) %} - {% for item in items %} - {% if item.status == 1 %} -创建时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 2 %} -完成时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 3 %} -关闭时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% elseif item.status == 4 %} -退款时间:{{ date('Y-m-d H:i:s',item.create_time) }}
- {% endif %} - {% endfor %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/course/show_meta.volt b/app/Http/Home/Views/course/show_meta.volt index ff79b74d..13559c68 100644 --- a/app/Http/Home/Views/course/show_meta.volt +++ b/app/Http/Home/Views/course/show_meta.volt @@ -65,7 +65,7 @@ 市场价格 {{ '¥%0.2f'|format(course.market_price) }} {% else %} - 优惠价格 + 市场价格 免费 {% endif %} {% if course.vip_price > 0 %} diff --git a/app/Http/Home/Views/macros/order.volt b/app/Http/Home/Views/macros/order.volt index dd1a954b..5fe4b32d 100644 --- a/app/Http/Home/Views/macros/order.volt +++ b/app/Http/Home/Views/macros/order.volt @@ -4,7 +4,7 @@课程名称:{{ course.title }}
- 优惠价格:{{ '¥%0.2f'|format(course.market_price) }} + 市场价格:{{ '¥%0.2f'|format(course.market_price) }} 会员价格:{{ '¥%0.2f'|format(course.vip_price) }}
{% if course.model in [1,2,3] %} @@ -23,7 +23,7 @@课程名称:{{ course.title }}
- 优惠价格:{{ '¥%0.2f'|format(course.market_price) }} + 市场价格:{{ '¥%0.2f'|format(course.market_price) }} 会员价格:{{ '¥%0.2f'|format(course.vip_price) }}
{% if course.model in [1,2,3] %} diff --git a/app/Models/Order.php b/app/Models/Order.php index 8f89eb57..cf8e3f5b 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -258,7 +258,7 @@ class Order extends Model if (!$order) return $sn; - $this->getOrderSn(); + return $this->getOrderSn(); } } diff --git a/app/Models/Refund.php b/app/Models/Refund.php index 0b53e770..2a40c230 100644 --- a/app/Models/Refund.php +++ b/app/Models/Refund.php @@ -182,7 +182,7 @@ class Refund extends Model if (!$order) return $sn; - $this->getRefundSn(); + return $this->getRefundSn(); } } diff --git a/app/Models/Trade.php b/app/Models/Trade.php index 3d1148e5..9033f698 100644 --- a/app/Models/Trade.php +++ b/app/Models/Trade.php @@ -185,7 +185,7 @@ class Trade extends Model if (!$order) return $sn; - $this->getTradeSn(); + return $this->getTradeSn(); } }