-
-
我的退款
- {% for key,value in status_types %}
- {% set class = (status == key) ? 'layui-btn layui-btn-xs' : 'none' %}
- {% set url = (key == 'all') ? url({'for':'home.uc.refunds'}) : url({'for':'home.uc.refunds'},{'status':key}) %}
-
{{ value }}
- {% endfor %}
-
- {% if pager.total_pages > 0 %}
-
- {% for item in pager.items %}
- {% set refund_info_url = url({'for':'home.refund.info'},{'sn':item.sn}) %}
-
-
-
-
{{ item.subject }}
-
{{ '￥%0.2f'|format(item.amount) }}
-
{{ refund_status(item.status) }}
-
-
-
-
-
+
+
+
我的退款
+ {% for key,value in status_types %}
+ {% set class = (status == key) ? 'layui-btn layui-btn-xs' : 'none' %}
+ {% set url = (key == 'all') ? url({'for':'home.uc.refunds'}) : url({'for':'home.uc.refunds'},{'status':key}) %}
+
{{ value }}
{% endfor %}
- {{ partial('partials/pager') }}
- {% endif %}
+ {% if pager.total_pages > 0 %}
+
+ {% for item in pager.items %}
+ {% set refund_info_url = url({'for':'home.refund.info'},{'sn':item.sn}) %}
+
+
+
+
{{ item.subject }}
+
{{ '￥%0.2f'|format(item.amount) }}
+
{{ refund_status(item.status) }}
+
+
+
+
+
+ {% endfor %}
+
+ {{ partial('partials/pager') }}
+ {% endif %}
+
diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php
index 8283f49c..cfce4822 100644
--- a/app/Library/AppInfo.php
+++ b/app/Library/AppInfo.php
@@ -11,11 +11,13 @@ class AppInfo
protected $link = 'https://koogua.com';
- protected $version = '1.2.5';
+ protected $version = '1.2.6';
public function __get($name)
{
- return $this->{$name} ?? null;
+ if (isset($this->{$name})) {
+ return $this->{$name};
+ }
}
}
\ No newline at end of file
diff --git a/app/Models/Audit.php b/app/Models/Audit.php
index 2b23a82e..11389810 100644
--- a/app/Models/Audit.php
+++ b/app/Models/Audit.php
@@ -68,8 +68,6 @@ class Audit extends Model
public function beforeCreate()
{
- $this->create_time = time();
-
if (is_array($this->req_data) && !empty($this->req_data)) {
foreach ($this->req_data as $key => $value) {
if (!is_scalar($value)) {
@@ -80,7 +78,11 @@ class Audit extends Model
}
}
$this->req_data = kg_json_encode($this->req_data);
+ } else {
+ $this->req_data = '';
}
+
+ $this->create_time = time();
}
}
\ No newline at end of file
diff --git a/app/Models/PointGift.php b/app/Models/PointGift.php
index a24e4313..f1c8bddf 100644
--- a/app/Models/PointGift.php
+++ b/app/Models/PointGift.php
@@ -24,8 +24,7 @@ class PointGift extends Model
protected $_course_attrs = [
'id' => 0,
'title' => '',
- 'market_price' => 0,
- 'study_expiry_time' => 0,
+ 'price' => 0,
];
/**
diff --git a/app/Validators/PointGift.php b/app/Validators/PointGift.php
index d764c537..8e7448e2 100644
--- a/app/Validators/PointGift.php
+++ b/app/Validators/PointGift.php
@@ -101,6 +101,17 @@ class PointGift extends Validator
return kg_cos_img_style_trim($value);
}
+ public function checkAttrs(PointGiftModel $gift, array $attrs)
+ {
+ $result = $gift->attrs;
+
+ if ($gift->type == PointGiftModel::TYPE_GOODS) {
+ $result['url'] = $attrs['url'];
+ }
+
+ return $result;
+ }
+
public function checkType($type)
{
$list = PointGiftModel::types();
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index 2b86ebde..d30bd0c5 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -1683,7 +1683,7 @@
}
.order-card {
- padding: 15px 20px;
+ padding: 10px 0;
margin-bottom: 20px;
background-color: white;
color: #666;
@@ -1842,7 +1842,6 @@
.gift-meta .info {
float: left;
- width: 400px;
}
.gift-meta .info p {