|
@@ -556,6 +556,16 @@ class My extends Core
|
|
$card_type['shop_type'][$k1] = $shop_type[$v1];
|
|
$card_type['shop_type'][$k1] = $shop_type[$v1];
|
|
}
|
|
}
|
|
$card_type['shop_type'] = implode(',', $card_type['shop_type']);
|
|
$card_type['shop_type'] = implode(',', $card_type['shop_type']);
|
|
|
|
+
|
|
|
|
+ if ($card['end_dh_day'] && $card['end_dh_day'] > 0) {
|
|
|
|
+ $code['eddate'] = $code['bdate'] + ($card['end_dh_day'] * 86400);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ $end_date = '';
|
|
|
|
+ if (isset($code['eddate']) && $code['eddate'] && $code['eddate'] > 0) {
|
|
|
|
+ $end_date = date('Y/m/d', $code['eddate']);
|
|
|
|
+ }
|
|
|
|
+
|
|
$v += array
|
|
$v += array
|
|
(
|
|
(
|
|
'name' => $card['name'],
|
|
'name' => $card['name'],
|
|
@@ -565,6 +575,7 @@ class My extends Core
|
|
'card_status' => $code['status'],
|
|
'card_status' => $code['status'],
|
|
'shop_type' => $card_type['shop_type'],
|
|
'shop_type' => $card_type['shop_type'],
|
|
'card_desc' => $card['content'],
|
|
'card_desc' => $card['content'],
|
|
|
|
+ 'end_date' => $end_date,
|
|
);
|
|
);
|
|
} elseif ($v['type'] == 3) {
|
|
} elseif ($v['type'] == 3) {
|
|
$prize = Dever::db('setting/prize')->find($v['type_id']);
|
|
$prize = Dever::db('setting/prize')->find($v['type_id']);
|