edit

service/agent/database/dh_order.php

@@ -32,15 +32,15 @@ if (Dever::load('manage/auth')->checkFunc('agent.dh_order', 'edit', '审核')){
 
 $status = array
 (
-    1 => '待支付',
-    2 => '待审核',
-    3 => '已审核（未发货）',
-    4 => '已审核（已发货）',
-    5 => '已完成',
-    6 => '已完成（有退款）',
-    7 => '作废',
-    8 => '已退款',
-    11 => '已过期',
+    1 => array('name' => '待支付', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '待审核', 'style' => 'font-weight:bold;color:#436EEE'),
+    3 => array('name' => '已审核（未发货）', 'style' => 'font-weight:bold;color:green'),
+    4 => array('name' => '已审核（已发货）', 'style' => 'font-weight:bold;color:green'),
+    5 => array('name' => '已完成', 'style' => 'font-weight:bold;color:green'),
+    6 => array('name' => '已完成（有退款）', 'style' => 'font-weight:bold;color:green'),
+    7 => array('name' => '作废', 'style' => 'font-weight:bold;color:#CD3700'),
+    8 => array('name' => '已退款', 'style' => 'font-weight:bold;color:#CD3700'),
+    11 => array('name' => '已过期', 'style' => 'font-weight:bold;color:#CD3700'),
 );
 
 $refund_status = array

service/agent/database/member.php

@@ -13,11 +13,11 @@ $role = function()
 
 $status = array
 (
-    1 => '未认证',
-    2 => '正常',
+    1 => array('name' => '未认证', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '正常', 'style' => 'font-weight:bold;color:green'),
     //3 => '驳回',
     //4 => '已删除',
-    5 => '已禁用',
+    5 => array('name' => '已禁用', 'style' => 'font-weight:bold;color:#CD3700'),
 );
 
 $type = array
@@ -77,36 +77,12 @@ $level = function()
 
 $info = '';
 $button = array();
-$getInfo = Dever::input('getInfo');
-$pmid = Dever::input('search_option_pmid');
-$parent_mid = Dever::input('search_option_parent_mid');
-$search_api_parent_mid = Dever::input('search_api_parent_mid');
-if ($search_api_parent_mid && $getInfo != 1) {
-    Dever::setInput('search_api_parent_mid', 0);
-    $parent = Dever::db('agent/member')->find(array('mobile' => $search_api_parent_mid));
-    Dever::setInput('search_api_parent_mid', $search_api_parent_mid);
-    //Dever::setInput('search_option_parent_mid', $parent['id']);
-    if ($parent) {
-        $info = '上级' . Dever::load('agent/lib/member')->getInfoString($parent) . ', 以下为直推列表：';
-    }
-} elseif ($parent_mid && $parent_mid > 0 && $getInfo != 1) {
-    $info = '上级' . Dever::load('agent/lib/member')->getInfoString($parent_mid) . ', 以下为直推列表：';
-    $button = array
-    (
-        '返回上一页' => array('location', 'l=project/database/list&project=agent&table=member_area&page_type=1&mid=' . $parent_mid),
-        //'返回上一页' => array('onclick', 'history.back()'),
-    );
-}
 $list_button = array();
 $list_button['list'] = array('查看详情', '"member_area&mid={id}&page_type=1&[refer]"');
 if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit6', '查看上下级')) {
-    $list_button['list1'] = array('查看上下级',Dever::url('lib/manage.relation?mid={id}', 'agent'));
+    $list_button['list1'] = array('查看上下级',Dever::url('lib/manage.relation?mid={id}&[refer]', 'agent'));
 }
 
-// (
-//     'list' => array('查看详情', '"member_area&mid={id}&page_type=1&[refer]"'),
-// );
-
 # id小于50000为导入的数据
 return array
 (
@@ -141,12 +117,24 @@ return array
         'name'      => array
         (
             'type'      => 'varchar-100',
-            'name'      => '姓名',
+            'name'      => '代理商姓名/手机号',
             'default'   => '',
             'desc'      => '姓名',
             'match'     => 'is_string',
             'update'    => 'text',
+<<<<<<< HEAD
             'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
+=======
+            //'search'    => 'fulltext',
+            'search'    => array
+            (
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
+                'result' => 'id',
+                'search' => 'id',
+            ),
+            'list_name' => '代理商信息',
+>>>>>>> 151a6083c511eb33ea442b3fcfd42d8c35f7f464
             'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)',
         ),
 
@@ -160,7 +148,8 @@ return array
             'update'    => 'date',
             'callback'  => 'maketime',
             // 'list'        => '{rdate} > 0 ? date("Y-m-d H:i", {rdate}) : "无"',
-            'list'      => ($pmid) ? false:'Dever::load("agent/lib/member.set_rdate", {id})',
+            'list'      => 'Dever::load("agent/lib/member.set_rdate", {id})',
+            'list_order' => 100,
         ),
 
         'avatar'		=> array
@@ -183,7 +172,7 @@ return array
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             'update'    => 'text',
-            'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
+            //'search'    => 'fulltext',
             //'list'      => true,
         ),
 
@@ -232,20 +221,20 @@ return array
         'parent_mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '邀请人手机号',
+            'name'      => '上级姓名/手机号',
             'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
             //'update'    => 'text',
-            'search'    => $parent_mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
-                'col' => 'parent_mid',
+                'search' => 'parent_mid',
             ),
-            'list_name' => '上级',
-            'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("agent/lib/member.getOne", {parent_mid})',
+            'list_name' => '上级信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {parent_mid})',
         ),
 
         'source_id'      => array
@@ -258,18 +247,6 @@ return array
             'search'    => 'select',
             //'update'    => 'checkbox',
             'option'    => $source_id,
-            // 'list'      => ($pmid) ? false : true,
-        ),
-
-        'pmid'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '邀请人id-废弃无用处',
-            'default'   => '-1',
-            'desc'      => '邀请人',
-            'match'     => 'is_string',
-            'update'    => 'text',
-            'search'    => 'hidden',
         ),
 
         'code'        => array
@@ -280,7 +257,6 @@ return array
             'desc'      => '代理商邀请码',
             'match'     => 'option',
             //'update'    => 'text',
-            //'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("invite/api.code", {id})',
             'list_order'=>1,
         ),
 
@@ -294,7 +270,6 @@ return array
             'search'	=> 'select',
             'update'    => 'select',
             'option'    => $role,
-            // 'list'      => ($pmid) ? true : false,
         ),
 
         'level_id'		=> array
@@ -320,7 +295,6 @@ return array
             'search'    => 'linkage',
             'update'    => 'linkage',
             'option'    => Dever::url('api.get?level_total=4', 'area'),
-            //'list'      =>($pmid) ? false: 'Dever::load("area/api.string", "{area}")',
         ),
 
         'is_shop'        => array
@@ -343,7 +317,6 @@ return array
             'match'     => 'is_numeric',
             'update'    => 'select',
             'update_search' => 'shop/lib/manage.search',
-            'list'      => ($parent_mid || $pmid) ? false : '{shop_id} > 0 ? Dever::load("shop/info-one#name", {shop_id}) : "无"',
         ),
 
         'type'        => array
@@ -458,7 +431,8 @@ return array
             'desc'      => '余额',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => ($pmid) ? false : true,
+            'list_name' => '余额<br />直推业绩<br />团队业绩',
+            'list'      => '"{cash}<br />{sell}<br />{group_sell}"',
         ),
 
         'sell'      => array
@@ -469,7 +443,6 @@ return array
             'desc'      => '销售业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => ($parent_mid || $pmid) ? true : false,
         ),
 
         'group_sell'      => array
@@ -480,7 +453,6 @@ return array
             'desc'      => '团队销售业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => ($parent_mid || $pmid) ? true : false,
         ),
 
         'old_group_sell'      => array
@@ -491,7 +463,6 @@ return array
             'desc'      => '历史团队业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            //'list'      => ($parent_mid || $pmid) ? true : false,
         ),
 
         'old_agentdownnum'      => array
@@ -502,7 +473,6 @@ return array
             'desc'      => '历史团队业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            //'list'      => ($parent_mid || $pmid) ? true : false,
         ),
 
         'status'        => array
@@ -546,7 +516,6 @@ return array
             # 只有insert时才生效
             'insert'    => true,
             //'search'    => 'date',
-            'list'      => ($pmid) ? 'date("Y-m-d H:i:s", {cdate})': false,
         ),
     ),
 
@@ -674,5 +643,16 @@ return array
             'type' => 'count',
             'col' => '*',
         ),
+
+        'getSearch' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'col' => 'yes-mobile,name',
+            ),
+            'type' => 'one',
+            'col' => '*',
+        ),
     ),
 );

service/agent/database/member_agreement.php

@@ -2,9 +2,9 @@
 
 $status = array
 (
-    1 => '待签署',
-    2 => '有效',
-    3 => '作废',
+    1 => array('name' => '待签署', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '有效', 'style' => 'font-weight:bold;color:green'),
+    3 => array('name' => '作废', 'style' => 'font-weight:bold;color:#CD3700'),
 );
 $mid = Dever::input('search_option_mid');
 $button = array();

service/agent/database/order.php

@@ -50,9 +50,9 @@ $pay_status = array
 
 $goods_status = array
 (
-    1 => '未发放',
-    2 => '无权益',
-    3 => '已发放',
+    1 => array('name' => '未发放', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '无权益', 'style' => 'font-weight:bold;'),
+    3 => array('name' => '已发放', 'style' => 'font-weight:bold;color:green'),
 );
 
 $type = array
@@ -169,18 +169,21 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '代理商',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'searchs'    => array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            //'list'      => 'Dever::load("agent/member-find#name", {mid})',
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/order", true)',
+            'list_order' => 3,
         ),
 
         'order_num'      => array
@@ -214,7 +217,7 @@ return array
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             'update'    => 'text',
-            'search'    => 'fulltext',
+            //'search'    => 'fulltext',
             //'list'      => true,
         ),
 
@@ -249,21 +252,20 @@ return array
         'parent_mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '邀请人手机号',
+            'name'      => '上级姓名/手机号',
             'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
             //'update'    => 'text',
-            'search'    => $parent_mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'parent_mid',
             ),
-            'list_name'      => '邀请人',
+            'list_name' => '上级信息',
             'list'      => 'Dever::load("agent/lib/member.getOne", {parent_mid})',
-            'list_order' => 4,
-            
         ),
 
         'source_id'      => array
@@ -289,10 +291,7 @@ return array
             'desc'      => '姓名',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => 'Dever::load("agent/lib/order.new_set",{id})',
-            // 'Dever::load("agent/lib/member.getOne", {id}, "agent/order")',
-            'list_order' => 3,
+            //'search'    => 'fulltext',
         ),
 
         'role'      => array
@@ -350,8 +349,10 @@ return array
             'match'     => 'option',
             'update'    => 'text',
             // 'list'		=> true,
-            'list_name' => '应付金额<br />实付金额<br />代理费<br />软件服务费<br />',
-            'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
+            //'list_name' => '应付金额<br />实付金额<br />代理费<br />软件服务费<br />',
+            'list_name' => '实付金额',
+            'list'      => true,
+            //'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
             'list_order' => 10,
         ),
 
@@ -451,7 +452,7 @@ return array
             'match'     => 'is_string',
             'match'     => Dever::rule('idcard'),
             'update'    => 'text',
-            'search'	=> 'fulltext',
+            //'search'	=> 'fulltext',
         ),
 
         'idcard_front'     => array

service/agent/lib/Dhorder.php

@@ -666,7 +666,7 @@ class Dhorder
 
         foreach ($goods as $k => $v) {
             $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v['goods_id'], $v['sku_id']);
-            $status = $goods_status[$v['status']];
+            $status = Dever::status($goods_status, $v['status']);
             $tk = Dever::db('agent/dh_order_refund')->find(array('order_id' => $info['id'], 'order_goods_id' => $v['id'], 'type' => 2));
             if ($tk && $tk['process'] == 1) {
                 $status = '申请' . $tk_status[$tk['status']];

service/agent/lib/Member.php

@@ -6,21 +6,25 @@ use Dever;
 
 class Member
 {
-    public function getOne($id, $table = 'agent/member')
+    public function getOne($id, $table = 'agent/member', $area = false)
     {
         if ($id < 0) {
             return '无';
         }
         $member = Dever::db($table)->find($id);
         if ($member) {
+            if (isset($member['mid'])) {
+                $member['id'] = $member['mid'];  
+            }
+
             $member['role'] = Dever::db('setting/role')->find($member['role']);
-            $url = Dever::url('project/database/list?project=agent&table=member_area&mid='.$member['id'].'&page_type=1&[refer]', 'manage');   
+            $url = Dever::url('project/database/list?project=agent&table=member_area&mid='.$member['id'].'&page_type=1&[refer]', 'manage');
             
             $member['name'] = '<a href="'.$url.'">' . $member['name'] . '</a>';
             $code = Dever::load("invite/api.code", $member['id']);
             $string = '';
             if ($code) {
-                $string = '[' . $code . ']<br />';
+                $string = '[' . $code . '] <br />';
             }
 
             $string .= $member['name'] . '<br />' . $member['mobile'] . '<br />' . $member['role']['name'];
@@ -29,9 +33,29 @@ class Member
                 $member['level'] = Dever::db('setting/level')->find($member['level_id']);
                 $string .= '（'.$member['level']['name'].'）';
             }
-            $source=Dever::db('setting/source')->one(array('id'=>$member['source_id'],'state'=>1));
-            if($source){
-                $string .= '<br/>'.$source['name'];
+
+            if (isset($member['shop_id']) && $member['shop_id'] > 0) {
+                $string .= ' ' . Dever::load("shop/info-one#name", $member['shop_id']);
+            }
+
+            if ($area) {
+                $area = Dever::load("area/api.string", $member['area']);
+                if ($area) {
+                    $string .= '<br />' . $area;
+                }
+            }
+
+            $member['mobile'] = strip_tags($member['mobile']);
+
+            $url = Dever::url('project/database/list?project=agent&table=member&search_api_parent_mid='.$member['mobile'].'&[refer]', 'manage');
+
+            $string .= '<br /><a href="'.$url.'">直推：'. Dever::load("invite/api")->getChildNum($member['id'], 1) . '</a>';
+
+            if ($member['source_id'] > 0) {
+                $source = Dever::db('setting/source')->one($member['source_id']);
+                if ($source) {
+                    $string .= '<br />来源：' . $source['name'];
+                }
             }
             
             return $string;
@@ -192,7 +216,7 @@ class Member
         if ($member['parent_mid'] && $member['parent_mid'] > 0) {
             $parent = Dever::db('agent/member')->one($member['parent_mid']);
             if ($parent) {
-                $result['邀请人信息'] = $this->getShowInfo($parent);
+                $result['上级信息'] = $this->getShowInfo($parent);
             }
         }
 
@@ -285,21 +309,21 @@ class Member
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '代理订单',
         );
 
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_parent_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_parent_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '直推代理订单',
         );
 
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_level_log&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_level_log&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '升级日志',
         );
 
@@ -325,42 +349,42 @@ class Member
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=cash&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=bill&table=cash&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '资金账户',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=sell&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=bill&table=sell&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '业绩流水',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '代理商权益',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '权益订单',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '代理商合同',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member&search_option_parent_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member&search_api_parent_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '查看直推团队',
         );
 

service/agent/lib/Order.php

@@ -405,7 +405,7 @@ class Order
         $role = Dever::db('setting/role')->one($info['role']);
         $area = Dever::load("area/api.string", $info['area']);
 
-        $status = $config['status'][$info['status']];
+        $status = Dever::status($config['status'], $info['status']);
 
         $member = array();
         if ($info['mid'] > 0) {
@@ -1037,9 +1037,9 @@ class Order
             if ($agreement) {
                 foreach ($agreement as $k => $v) {
                     $agreement_info = Dever::db('setting/agreement')->find($v['agreement_id']);
-                    $agreement_status_name = $agreement_status[$v['status']];
+                    $agreement_status_name = Dever::status($agreement_status, $v['status']);
 
-                    $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $sign_pic, $agreement_status_name);
+                    $table['body'][] = array(Dever::status($agreement_type, $agreement_info['type']), Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $sign_pic, $agreement_status_name);
                 }
             } else {
                 $agreement_title = '';
@@ -1056,17 +1056,17 @@ class Order
             }
 
             $agreement = Dever::db('setting/agreement')->getData();
-            $agreement_status_name = $agreement_status[1];
-            $table['body'][] = array($agreement_type[$agreement[1]['type']], Dever::load('agent/lib/agreement')->name($agreement[1], $info, $role, 1), $sign_pic, $agreement_status_name);
+            $agreement_status_name = Dever::status($agreement_status, 1);
+            $table['body'][] = array(Dever::status($agreement_type, $agreement[1]['type']), Dever::load('agent/lib/agreement')->name($agreement[1], $info, $role, 1), $sign_pic, $agreement_status_name);
             if ($info['soft_cash'] && $info['soft_cash'] > 0) {
                 $table['body'][] = array($agreement_type[$agreement[3]['type']], Dever::load('agent/lib/agreement')->name($agreement[3], $info, $role, 1), $sign_pic, $agreement_status_name);
             }
             
             if ($info['order_type'] == 2) {
                 # 升级的话，增加解除合同
-                $table['body'][] = array($agreement_type[$agreement[2]['type']], Dever::load('agent/lib/agreement')->name($agreement[2], $info, $role, 1), $sign_pic, $agreement_status_name);
+                $table['body'][] = array(Dever::status($agreement_type, $agreement[2]['type']), Dever::load('agent/lib/agreement')->name($agreement[2], $info, $role, 1), $sign_pic, $agreement_status_name);
             } else {
-                $table['body'][] = array($agreement_type[$agreement[4]['type']], Dever::load('agent/lib/agreement')->name($agreement[4], $info, $role, 1), $sign_pic, $agreement_status_name);
+                $table['body'][] = array(Dever::status($agreement_type, $agreement[4]['type']), Dever::load('agent/lib/agreement')->name($agreement[4], $info, $role, 1), $sign_pic, $agreement_status_name);
             }
         }
 

service/agent/src/My.php

@@ -7,6 +7,13 @@ use Agent\Lib\Core;
 
 class My extends Core
 {
+    public function getSearch()
+    {
+        $data = Dever::db('agent/member')->getSearch(array('col' => '朱浙群'));
+
+        return $data;
+    }
+
     public function getCounty()
     {
         return Dever::load('area/import')->getCounty(440000, 441900, '44/4419.html');
@@ -612,8 +619,8 @@ class My extends Core
         $this->data['list'] = Dever::db('bill/cash')->getData($where);
         if ($this->data['list']) {
             foreach ($this->data['list'] as $k => $v) {
-                $this->data['list'][$k]['type_name'] = $this->data['type'][$v['type']];
-                $this->data['list'][$k]['status_name'] = $this->data['status'][$v['status']];
+                $this->data['list'][$k]['type_name'] = Dever::status($this->data['type'], $v['type']);
+                $this->data['list'][$k]['status_name'] = Dever::status($this->data['status'], $v['status']);
                 if ($v['type'] == 11) {
                     $tixian = Dever::db('bill/tixian')->find($v['type_id']);
                     if ($tixian && $tixian['status'] == 2) {
@@ -641,8 +648,8 @@ class My extends Core
         $config = Dever::db('bill/cash')->config['set'];
 
         if ($this->data['info']) {
-            $this->data['info']['type_name'] = $config['type'][$this->data['info']['type']];
-            $this->data['info']['status_name'] = $config['status'][$this->data['info']['status']];
+            $this->data['info']['type_name'] = Dever::status($config['type'], $this->data['info']['type']);
+            $this->data['info']['status_name'] = Dever::status($config['status'], $this->data['info']['status']);
 
             $this->data['info']['cdate'] = date('Y-m-d H:i', $this->data['info']['cdate']);
             if ($this->data['info']['cash'] > 0) {
@@ -866,7 +873,7 @@ class My extends Core
         if ($this->data['list']) {
             $status = Dever::db('agent/member_agreement')->config['status'];
             foreach ($this->data['list'] as $k => $v) {
-                $this->data['list'][$k]['status_name'] = $status[$v['status']];
+                $this->data['list'][$k]['status_name'] = Dever::status($status, $v['status']);
                 $this->data['list'][$k]['qdate_string'] = '';
                 if ($v['qdate']) {
                     $this->data['list'][$k]['qdate_string'] = date('Y.m.d', $v['qdate']);
@@ -891,7 +898,7 @@ class My extends Core
             $status = Dever::db('agent/member_agreement')->config['status'];
             $this->data['info'] = Dever::db('agent/member_agreement')->find($where);
             if ($this->data['info']) {
-                $this->data['info']['status_name'] = $status[$this->data['info']['status']];
+                $this->data['info']['status_name'] = Dever::status($status, $this->data['info']['status']);
                 $this->data['info']['qdate_string'] = '';
                 if ($this->data['info']['qdate']) {
                     $this->data['info']['qdate_string'] = date('Y.m.d', $this->data['info']['qdate']);

service/bill/database/cash.php

@@ -2,9 +2,9 @@
 
 $status = array
 (
-    1 => '待审核',
-    2 => '已审核',
-    3 => '已作废',
+    1 => array('name' => '待审核', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '已审核', 'style' => 'font-weight:bold;color:green'),
+    3 => array('name' => '已作废', 'style' => 'font-weight:bold;color:#CD3700'),
 );
 
 $manage_status = array

service/bill/database/sell.php

@@ -261,7 +261,7 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
-                'type' => array('yes', 'in'),
+                'type' => 'yes',
                 'state' => 1,
             ),
             'type' => 'all',
@@ -278,7 +278,7 @@ return array
                 'end' => array('yes-cdate', '<='),
                 'mid' => 'yes',
                 'stype' => 'yes',
-                'type' => array('yes', 'in'),
+                'type' => 'yes',
                 'state' => 1,
             ),
             'type' => 'one',

service/bill/database/tixian.php

@@ -2,16 +2,16 @@
 
 $status = array
 (
-    -1 => '未审核待发放',
-    1 => '已审核待发放',
-    2 => '已发放',
+    -1 => array('name' => '未审核待发放', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '已审核待发放', 'style' => 'font-weight:bold;color:green'),
+    3 => array('name' => '已发放', 'style' => 'font-weight:bold;color:#CD3700'),
 );
 
 $cash_status = array
 (
-    1 => '待审核',
-    2 => '已审核',
-    3 => '已作废',
+    1 => array('name' => '待审核', 'style' => 'font-weight:bold;color:#436EEE'),
+    2 => array('name' => '已审核', 'style' => 'font-weight:bold;color:green'),
+    3 => array('name' => '已作废', 'style' => 'font-weight:bold;color:#CD3700'),
 );
 
 $manage_status = array

service/bill/lib/Cron.php

@@ -34,37 +34,30 @@ class Cron
         $data = Dever::db('bill/sell')->getNumByTime($where);
         if ($data) {
         	foreach ($data as $k => $v) {
-                if($v['type']==2){
-                    if ($v['num'] > 0) {
-                        $w = array();
-                        $w['mid'] = $v['mid'];
-                        $w['month'] = $where['start'];
-                        $info = Dever::db('bill/sell_stat')->find($w);
-                        $w['new_num'] = $v['num'];
-                        $where['mid'] = $v['mid'];
-                        $total = Dever::db('bill/sell')->getNumByTimeOne($where);
-                        if ($total) {
-                            $w['num'] = $total['num'];
-                        }
-                        if ($info) {
-                            $w['where_id'] = $info['id'];
-                            Dever::db('bill/sell_stat')->update($w);
-                        } else {
-                            Dever::db('bill/sell_stat')->insert($w);
-                        }
-                    }
-                }else{
-                    if ($v['num'] > 0) {
+
+                if ($v['num'] > 0) {
                     $w = array();
                     $w['mid'] = $v['mid'];
                     $w['month'] = $where['start'];
+                    $w['clear'] = true;
                     $info = Dever::db('bill/sell_stat')->find($w);
-                    $w['new_ztnum'] = $v['num'];
+                    
                     $where['mid'] = $v['mid'];
+                    $where['type'] = $v['type'];
                     $total = Dever::db('bill/sell')->getNumByTimeOne($where);
-                    if ($total) {
-                        $w['zt_num'] = $total['num'];
+
+                    if ($v['type'] == 1) {
+                        $w['new_ztnum'] = $v['num'];
+                        if ($total) {
+                            $w['zt_num'] = $total['num'];
+                        }
+                    } else {
+                        $w['new_num'] = $v['num'];
+                        if ($total) {
+                            $w['num'] = $total['num'];
+                        }
                     }
+                    
                     if ($info) {
                         $w['where_id'] = $info['id'];
                         Dever::db('bill/sell_stat')->update($w);
@@ -72,8 +65,6 @@ class Cron
                         Dever::db('bill/sell_stat')->insert($w);
                     }
                 }
-                }
-        		
         	}
         }