Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/cash/database/shop.php

@@ -204,7 +204,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'all',
-            'order' => array('id' => 'desc'),
+            'order' => array('day'=>'desc','id' => 'desc'),
             'page' => array(10, 'list'),
             'col' => '*',
         ),

app/cash/database/shop_sell.php

@@ -204,7 +204,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'all',
-            'order' => array('id' => 'desc'),
+            'order' => array('day'=>'desc','id' => 'desc'),
             'page' => array(10, 'list'),
             'col' => '*',
         ),

learn/active/src/Api.php

@@ -116,15 +116,16 @@ Class Api extends Core {
     	return 'ok';
     }
 	#门票列表
-	public function GetList(){
+	public function getList(){
+		$data['user'] = $this->user;
 		$data['list'] = Dever::db('active/order')->getAll(array('mid'=>$this->uid));
 		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']);
-			if($v['status'] == 1){
-				$data['list']['status_name'] = '待支付';
-			}else{
-				$data['list']['status_name'] = '已完成';
-			}
+			$config = Dever::db('active/order')->config['config_status'];
+			$data['list'][$k]['status_name'] = Dever::status($config,$v['status']);
+
 		}
 		return $data;
 	}