dever 3 gadi atpakaļ
vecāks
revīzija
0c8ac9dab9

+ 10 - 0
service/agent/database/order.php

@@ -466,6 +466,16 @@ return array
             //'update'    => 'textarea',
         ),
 
+        'admin_desc'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '管理员备注',
+            'default'   => '',
+            'desc'      => '管理员备注',
+            'match'     => 'is_string',
+            //'update'    => 'textarea',
+        ),
+
         'status'        => array
         (
             'type'      => 'tinyint-1',

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

@@ -132,7 +132,7 @@ class Member
     public function up($member, $order_id, $role, $type, $mid, $cash, $sell, $level_id = false, $desc = '', $group_num = 0)
     {
         $data['where_id'] = $mid;
-        if ($cash != 0) {
+        if ($cash) {
             Dever::load('bill/lib/cash')->up($mid, $type, $cash, $role, $order_id, $desc, 2);
             $data['cash'] = $cash;
         }
@@ -420,7 +420,7 @@ class Member
                 array
                 (
                     array('资金余额', '<span style="color:blue">¥' . $member['cash'] . '元</span>'),
-                    //array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
+                    array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
                     array('团队业绩', '<span style="color:blue">¥' . $member['group_sell'] . '元</span>'),
                 ),
             ),

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

@@ -557,6 +557,15 @@ class Order
             $soft_price = $role['soft'];
         }
 
+        /*
+        $button[] = array
+        (
+            'type' => 'action',
+            'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&value=6', 'agent'),
+            'name' => '挂起',
+        );
+        */
+
         if ($info['status'] <= 3 && $info['status'] > 0) {
             # 未完成审核的订单,可以随时挂起
             $button[] = array