|
|
@@ -21,7 +21,7 @@ Class User extends Core
|
|
|
if ($time-$order['cdate']>300){
|
|
|
Dever::alert('订单已关闭');
|
|
|
}
|
|
|
- $info = Dever::db('active/order')->getNum(array('id'=>$this->uid,'active_id'=>$order['active_id']));
|
|
|
+ $info = Dever::db('active/order')->getNum(array('uid'=>$this->uid,'active_id'=>$order['active_id']));
|
|
|
$active = Dever::db('active/info')->find($order['active_id']);
|
|
|
if ($info['total'] >= $active['num']) {
|
|
|
Dever::alert('您已超过限购数量');
|
|
|
@@ -123,12 +123,19 @@ Class User extends Core
|
|
|
foreach($data['list'] as $k => $v){
|
|
|
$active = Dever::db('active/info')->find($v['active_id']);
|
|
|
$data['list'][$k]['active_name'] = $active['name'];
|
|
|
- $data['list'][$k]['cdate'] = date('Y.m.d H:i',$v['cdate']);
|
|
|
+
|
|
|
$config = Dever::db('active/order')->config['config_status'];
|
|
|
$data['list'][$k]['status_name'] = Dever::status($config,$v['status']);
|
|
|
$data['list'][$k]['total_price'] = $v['num'] * $v['price'];
|
|
|
$data['list'][$k]['pay_time'] = '';
|
|
|
$data['list'][$k]['mobile'] = $active['mobile'];
|
|
|
+ $data['list'][$k]['time'] = '';
|
|
|
+ if ($v['status'] == 1) {
|
|
|
+ if (time() < =$v['cdate'] + 300 ){
|
|
|
+ $data['list'][$k]['time'] = date('H`i',time()-$v['cdate'] + 300);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $data['list'][$k]['cdate'] = date('Y.m.d H:i',$v['cdate']);
|
|
|
}
|
|
|
return $data;
|
|
|
}
|
|
|
@@ -148,6 +155,14 @@ Class User extends Core
|
|
|
$active = Dever::db('active/info')->find($data['info']['active_id']);
|
|
|
$data['info']['active_name'] = $active['name'];
|
|
|
$data['info']['cash'] = $active['price'];#单价
|
|
|
+ $data['info']['time'] = '';
|
|
|
+ if ($data['info']['status'] == 1) {
|
|
|
+ if (time() <= $data['info']['cdate'] + 300) {
|
|
|
+ $time = time()-$data['info']['cdate'] + 300;
|
|
|
+ $data['info']['time'] = date('H`i',$time);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
$data['info']['cdate'] = date('Y-m-d H:i',$data['info']['cdate']);
|
|
|
$config = Dever::db('active/order')->config['config_status'];
|
|
|
$data['info']['status_name'] = Dever::status($config,$data['info']['status']);
|
|
|
@@ -162,6 +177,7 @@ Class User extends Core
|
|
|
if ($active['share_name']) {
|
|
|
$data['info']['share_name'] = $active['share_name'];
|
|
|
}
|
|
|
+
|
|
|
$data['info']['mobile'] = $active['mobile'];
|
|
|
$data['info']['field'] = array();
|
|
|
if ($data['info']['path']) {
|
|
|
@@ -191,8 +207,8 @@ Class User extends Core
|
|
|
}
|
|
|
$no_code = $data['info']['num']-count($code)-$data['info']['refund_num'];
|
|
|
if ($data['info']['status'] == 2) {
|
|
|
- $data['info']['use_code'] = '已使用'.count($code).'个';
|
|
|
- $data['info']['no_code'] = '未使用'.$no_code.'个';
|
|
|
+ $data['info']['use_code'] = count($code);
|
|
|
+ $data['info']['no_code'] = $no_code;
|
|
|
if ($code) {
|
|
|
foreach ($code as $k => $v) {
|
|
|
if ($v['status'] == 1) {
|
Your Name