rabin 3 năm trước cách đây
mục cha
commit
ebc34be338

+ 5 - 3
service/agent/database/order.php

@@ -303,14 +303,15 @@ return array
         'price'      => array
         (
             'type'      => 'float-11,2',
-            'name'      => '实付金额',
+            'name'      => '金额',
             'default'   => '0',
             'desc'      => '金额',
             'match'     => 'option',
             'update'    => 'text',
             // 'list'		=> true,
+            'list_name' => '应付金额<br />实付金额<br />代理费<br />软件服务费<br />',
             'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
-            'list_order' => 6,
+            'list_order' => 10,
         ),
 
         'pay_type'		=> array
@@ -603,8 +604,9 @@ return array
             'insert'    => true,
             'search'    => 'date',
             // 'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            'list_name' => '注册时间<br />初审时间<br />终审时间<br />完成时间<br />',
             'list'      => 'Dever::load("agent/lib/order.set_cdate", {id})',
-            'list_order' => 2,
+            'list_order' => 200,
         ),
     ),
 

+ 1 - 1
service/agent/lib/Member.php

@@ -84,7 +84,7 @@ class Member
         	Dever::alert('邀请码错误');
         }
 
-        if ($user['status'] == 2) {
+        if ($user['status'] <= 2) {
         	return $user;
         }
 

+ 9 - 1
service/agent/lib/Order.php

@@ -1049,12 +1049,20 @@ class Order
         }else{
             $data['完成']='-';
         }
-        $html=Dever::table($data);
+        $html = $data['注册'];
+        $html .= '<br />' . $data['初审'];
+        $html .= '<br />' . $data['终审'];
+        $html .= '<br />' . $data['完成'];
         return $html;
         // '注册时间:'.$zhuce.'<br/>初审时间:'.$chushen.'<br/>终审时间:'.$zhongshen.'<br/>完成时间:'.$wancheng;
     }
     public function set_price($id){
         $info=Dever::db('agent/order')->one(array('id'=>$id,'state'=>1));
+        $html = $info['f_price'];
+        $html .= '<br />' . $info['price'];
+        $html .= '<br />' . $info['agent_cash'];
+        $html .= '<br />' . $info['soft_cash'];
+        return $html;
         $data['注册金额']=$info['f_price'];
         $data['实付金额']=$info['price'];
         $data['代理费']=$info['agent_cash'];

+ 3 - 3
service/bill/database/cash.php

@@ -127,9 +127,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 1,
+            //'search'    => 'fulltext',
+            //'list'      => true,
+            //'list_order'  => 1,
         ),
 
         'role'      => array

+ 3 - 3
service/bill/database/sell.php

@@ -117,9 +117,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 1,
+            //'search'    => 'fulltext',
+            //'list'      => true,
+            //'list_order'  => 1,
         ),
 
         'type'      => array

+ 3 - 3
service/bill/database/tixian.php

@@ -103,9 +103,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 1,
+            //'search'    => 'fulltext',
+            //'list'      => true,
+            //'list_order'  => 1,
         ),
 
         'ycash'      => array

+ 3 - 3
service/option/database/bill_duifu.php

@@ -72,9 +72,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 1,
+            //'search'    => 'fulltext',
+            //'list'      => true,
+            //'list_order'  => 1,
         ),
 
         'type'        => array

+ 3 - 3
service/option/database/bill_fafang.php

@@ -72,9 +72,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 1,
+            //'search'    => 'fulltext',
+            //'list'      => true,
+            //'list_order'  => 1,
         ),
 
         'type'        => array

+ 3 - 3
service/option/database/bill_jiaofu.php

@@ -74,9 +74,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 1,
+            //'search'    => 'fulltext',
+            //'list'      => true,
+            //'list_order'  => 1,
         ),
 
         'type'        => array