edit

learn/active/database/code.php

@@ -222,7 +222,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'join_id' => 'yes',
+                'join_uid' => 'yes',
                 'state' => 1,
             ),
             'type' => 'all',

learn/active/src/User.php

@@ -132,7 +132,8 @@ Class User extends Core
             $data['list'][$k]['time'] = '';
             if ($v['status'] == 1) {
                 if (time() <= $v['cdate'] + 300 ){
-                    $data['list'][$k]['time'] = date('H`i',time()-$v['cdate'] + 300);
+                    $time = time()-$data['info']['cdate'] + 300;
+                    $data['list'][$k]['time'] = date('H:i',$time);
                 }
             }
             $data['list'][$k]['cdate'] = date('Y.m.d H:i',$v['cdate']);
@@ -159,7 +160,7 @@ Class User extends Core
             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']['time'] = date('H:i',$time);
                 }
                
             }

service/agent/database/member.php

@@ -136,7 +136,11 @@ if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit6', '查看关系
     $list_button['list1'] = array('查看关系图谱',Dever::url('lib/manage.relation?mid={id}&[refer].manage', 'agent'));
 }
 */
-
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 
 # id小于50000为导入的数据
 return array
@@ -189,7 +193,7 @@ return array
                 'search' => 'id',
             ),
             'list_name' => '代理商信息',
-            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)' : false,
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true, true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)' : false),
         ),
 
         'name'      => array
@@ -298,7 +302,7 @@ return array
         'parent_mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '上级姓名/手机号',
+            'name'      => '推荐人姓名/手机号',
             'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
@@ -310,8 +314,8 @@ return array
                 'result' => 'id',
                 'search' => 'parent_mid',
             ) : false,
-            'list_name' => '上级信息',
-            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false,
+            'list_name' => '推荐人信息',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {parent_mid},"agent/member", false, true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false),
         ),
 
         'source_id'      => array
@@ -534,8 +538,8 @@ return array
             'match'     => 'is_numeric',
             'search'    => 'exp',
             'update'    => 'text',
-            'list_name' => '余额<br />直推业绩<br />团队业绩',
-            'list'      => $search_auth == 1 ?'"{cash}<br />{sell}<br />{group_sell}"' : false,
+            'list_name' => $admin_auth ? '余额' : '余额<br />直推业绩<br />团队业绩',
+            'list'      => $admin_auth ? '"{cash}"' : ($search_auth == 1 ?'"{cash}<br />{sell}<br />{group_sell}"' : false),
         ),
 
         'sell'      => array

service/agent/database/member_goods.php

@@ -51,6 +51,11 @@ $excel = false;
 if(Dever::load('manage/auth')->checkFunc('agent.member_goods', 'editMout', '数据导出')){
     $excel[] = array('数据导出','权益管理', 'agent/lib/dhorder.out_member_goods');
 }
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 return array
 (
     # 表名
@@ -95,7 +100,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 3,
         ),
 

service/agent/database/member_goods_log.php

@@ -10,6 +10,11 @@ if ($mid) {
         '返回上一页' => array('location', 'l=project/database/list&project=agent&table=member_goods&search_option_mid=' . $mid . '&search_api_mid=' . $search_api_mid),
     );
 }
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 
 return array
 (
@@ -50,7 +55,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/agent/database/member_level_log.php

@@ -33,6 +33,12 @@ $type = array
     2 => '后台修改',
 );
 
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
+
 return array
 (
     # 表名
@@ -72,7 +78,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true, true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/agent/database/member_shop_log.php

@@ -9,6 +9,11 @@ $shop = function()
     }
     return $array;
 };
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 # 权限设置 1是归店记录列表、2是归店详细信息
 $search_auth = Dever::input('search_option_dever_auth', 1);
 return array
@@ -50,7 +55,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)': 'Dever::load("bill/lib/manage.guidian",{mid})',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)': 'Dever::load("bill/lib/manage.guidian",{mid})'),
             'list_order' => 1,
         ),
 

service/agent/database/order.php

@@ -133,6 +133,11 @@ if ($pmid) {
 # 权限设置 1是查看详情、2是城市数据统计
 $search_auth = Dever::input('search_option_dever_auth', 1);
 $list_button = array();
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 if($search_auth == 1){
     $list_button['list'] = array('查看详情', '"order_process&project=agent&order_id={id}&page_type=1&[refer]"');
     if(Dever::load('manage/auth')->checkFunc('agent.order', 'editSoftorderout', '软件服务费数据导出')){
@@ -151,6 +156,8 @@ $invite_type = array
     1 => '邀请人',
     2 => '来源',
 );
+
+
 # id小于50000为导入的数据
 
 return array
@@ -205,7 +212,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)' : false,
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)' : false),
             'list_order' => 3,
         ),
 
@@ -276,7 +283,7 @@ return array
         'parent_mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '上级姓名/手机号',
+            'name'      => '邀请人姓名/手机号',
             'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
@@ -288,8 +295,8 @@ return array
                 'result' => 'id',
                 'search' => 'parent_mid',
             ),
-            'list_name' => '上级信息',
-            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false,
+            'list_name' => '邀请人信息',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {parent_mid}, "agent/member", false,true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false),
         ),
 
         'source_id'      => array

service/agent/database/soft_cash.php

@@ -45,6 +45,11 @@ if(Dever::load('manage/auth')->checkFunc('agent.soft_cash', 'editSoftcash', '数
     $list_button = array();
     $list_button['list'] = array('查看详情', '"member_prize&project=agent&id={id}&page_type=1&[refer]"');
 $list_button['oper'] = array('删除订单', '"agent/lib/soft_cash.setOrderStatus?id={id}&value=4"', '{status} == 4');
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 return array
 (
     # 表名
@@ -94,7 +99,7 @@ return array
                 'result' => 'id',
                 'search' => 'mid',
             ),
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 2,
         ),
          'mobile'      => array

service/agent/database/user_bind.php

@@ -20,7 +20,11 @@ $type = array
 );
 
 $col = Dever::input('col');
-
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 return array
 (
     # 表名
@@ -77,7 +81,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 3,
         ),
 

service/agent/lib/Member.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Member
 {
-    public function getOne($id, $table = 'agent/member', $area = false)
+    public function getOne($id, $table = 'agent/member', $area = false, $admin_auth = false)
     {
         if ($id < 0) {
             return '无';
@@ -36,11 +36,13 @@ class Member
                
             }
             $string .= $member['name'] . '（'.$member['id'].'）' .'<br />' . $member['mobile'] . '<br />' . $member['role']['name'].$prize_type;
-            
-            if (isset($member['level_id']) && $member['level_id'] && $member['level_id'] > 0) {
-                $member['level'] = Dever::db('setting/level')->find($member['level_id']);
-                $string .= '（'.$member['level']['name'].'）';
+            if (!$admin_auth) {
+                if (isset($member['level_id']) && $member['level_id'] && $member['level_id'] > 0) {
+                    $member['level'] = Dever::db('setting/level')->find($member['level_id']);
+                    $string .= '（'.$member['level']['name'].'）';
+                }
             }
+            
 
             if (isset($member['shop_id']) && $member['shop_id'] > 0) {
                 $string .= ' ' . Dever::load("shop/info-one#name", $member['shop_id']);
@@ -56,8 +58,10 @@ class Member
             $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 (!$admin_auth) {
+                $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']);
@@ -217,16 +221,20 @@ class Member
     {
         $mid = Dever::input('mid');
         $member = Dever::db('agent/member')->one($mid);
-
+        $admin = Dever::load('manage/auth.info');
+        $admin_auth = false;
+        if ($admin && $admin['role'] == 24){
+            $admin_auth = $admin['role'];
+        }
         $config_type = Dever::db('agent/member')->config['config_type'];
         $config_status = Dever::db('agent/member')->config['config_status'];
 
-        $result['代理商信息'] = $this->getShowInfo($member);
+        $result['代理商信息'] = $this->getShowInfo($member,$admin_auth);
 
         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,$admin_auth);
             }
         }
 
@@ -490,7 +498,7 @@ class Member
         return $html;
     }
 
-    public function getShowInfo($member)
+    public function getShowInfo($member,$admin_auth=false)
     {
         $role = Dever::db('setting/role')->one($member['role']);
         $level = Dever::db('setting/level')->one($member['level_id']);
@@ -533,25 +541,47 @@ class Member
             $default = Dever::db('passport/avatar')->one(1);
             $member['avatar'] = $default['avatar'];
         }
-
-        $result = array
-        (
-            'type' => 'user',
-            'pic' => $member['avatar'],
-            'content' => array
+        if ($admin_auth) {
+            $result = array
             (
-                $member['name'],
-                array('手机号', $member['mobile']),
-                array('邀请码', $code),
-                array('代理商头衔', $title_name),
-                array('代理角色', $role['name']),
-                array('代理区域', $area),
-                array('所属店铺', $shop['name']),
-                array('资金余额', '<span style="color:blue">¥' . $member['cash'] . '元</span>'),
-                array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
-                array('团队业绩', '<span style="color:blue">¥' . $member['group_sell'] . '元</span>'),
-            ),
-        );
+                'type' => 'user',
+                'pic' => $member['avatar'],
+                'content' => array
+                (
+                    $member['name'],
+                    array('手机号', $member['mobile']),
+                    array('邀请码', $code),
+                    // array('代理商头衔', $title_name),
+                    array('代理角色', $role['name']),
+                    array('代理区域', $area),
+                    array('所属店铺', $shop['name']),
+                    array('资金余额', '<span style="color:blue">¥' . $member['cash'] . '元</span>'),
+                    // array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
+                    // array('团队业绩', '<span style="color:blue">¥' . $member['group_sell'] . '元</span>'),
+                ),
+            );
+        } else {
+            $result = array
+            (
+                'type' => 'user',
+                'pic' => $member['avatar'],
+                'content' => array
+                (
+                    $member['name'],
+                    array('手机号', $member['mobile']),
+                    array('邀请码', $code),
+                    array('代理商头衔', $title_name),
+                    array('代理角色', $role['name']),
+                    array('代理区域', $area),
+                    array('所属店铺', $shop['name']),
+                    array('资金余额', '<span style="color:blue">¥' . $member['cash'] . '元</span>'),
+                    array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
+                    array('团队业绩', '<span style="color:blue">¥' . $member['group_sell'] . '元</span>'),
+                ),
+            );
+        }
+
+        
 
         return $result;
     }

service/agent/lib/Order.php

@@ -528,6 +528,12 @@ class Order
 
         $info = Dever::db('agent/order')->one($id);
 
+        $admin = Dever::load('manage/auth.info');
+        $admin_auth = false;
+        if ($admin && $admin['role'] == 24){
+            $admin_auth = $admin['role'];
+        }
+
         $process = Dever::db('agent/order_process')->getData(array('order_id' => $id));
         $process_status = Dever::db('agent/order_process')->config['status'];
 
@@ -641,32 +647,55 @@ class Order
         $result['账号信息']['content'][] = array('身份证照片', $idcard_pic);
         $result['账号信息']['content'][] = array('代理商签名', $sign_pic);
 
+        if ($admin_auth) {
+            $result['支付信息'] = array
+            (
+                'type' => 'user',
+                'content' => array
+                (
+                    array('支付方式', $config['pay_type'][$info['pay_type']]),
+                    array('支付状态', $config['pay_status'][$info['pay_status']]),
+                    array('付款备注', $info['desc']),
 
-        $result['支付信息'] = array
-        (
-            'type' => 'user',
-            'content' => array
+                    array('应付金额', '¥' . $info['f_price'] . '元'),
+                    array('实付金额', '¥' . $info['price'] . '元'),
+                    // array('代理费', '¥' . $info['agent_cash'] . '元'),
+
+                    // array('软件服务费', '¥' . $info['soft_cash'] . '元'),
+                    // array('商品价值', '¥' . $info['goods_cash'] . '元'),
+                    // array('赠送期权价值', '¥' . $info['option_price'] . '元'),
+
+                    array('支付凭证', $pay_pic),
+                ),
+            );
+        } else {
+            $result['支付信息'] = array
             (
-                array('支付方式', $config['pay_type'][$info['pay_type']]),
-                array('支付状态', $config['pay_status'][$info['pay_status']]),
-                array('付款备注', $info['desc']),
+                'type' => 'user',
+                'content' => array
+                (
+                    array('支付方式', $config['pay_type'][$info['pay_type']]),
+                    array('支付状态', $config['pay_status'][$info['pay_status']]),
+                    array('付款备注', $info['desc']),
 
-                array('应付金额', '¥' . $info['f_price'] . '元'),
-                array('实付金额', '¥' . $info['price'] . '元'),
-                array('代理费', '¥' . $info['agent_cash'] . '元'),
+                    array('应付金额', '¥' . $info['f_price'] . '元'),
+                    array('实付金额', '¥' . $info['price'] . '元'),
+                    array('代理费', '¥' . $info['agent_cash'] . '元'),
 
-                array('软件服务费', '¥' . $info['soft_cash'] . '元'),
-                array('商品价值', '¥' . $info['goods_cash'] . '元'),
-                array('赠送期权价值', '¥' . $info['option_price'] . '元'),
+                    array('软件服务费', '¥' . $info['soft_cash'] . '元'),
+                    array('商品价值', '¥' . $info['goods_cash'] . '元'),
+                    array('赠送期权价值', '¥' . $info['option_price'] . '元'),
 
-                array('支付凭证', $pay_pic),
-            ),
-        );
+                    array('支付凭证', $pay_pic),
+                ),
+            );
+        }
+        
 
         if ($info['parent_mid'] && $info['parent_mid'] > 0) {
             $parent = Dever::db('agent/member')->one($info['parent_mid']);
             if ($parent) {
-                $result['上级信息'] = Dever::load('agent/lib/member')->getShowInfo($parent);
+                $result['上级信息'] = Dever::load('agent/lib/member')->getShowInfo($parent,$admin_auth);
             }
         }
 

service/bill/database/cash.php

@@ -66,7 +66,11 @@ $mul = false;
 if (Dever::load('manage/auth')->checkFunc('bill.tixian', 'tixianedit', '批量审核')) {
     $mul = '{status} == 1';
 }
-
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 return array
 (
     # 表名
@@ -121,7 +125,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/bill/database/sell.php

@@ -41,7 +41,11 @@ $stype = array
     3 => '旧系统导入',
     4 => '自动补发',
 );
-
+$admin = Dever::load('manage/auth.info');
+$admin_auth = false;
+if ($admin && $admin['role'] == 24){
+    $admin_auth = $admin['role'];
+}
 return array
 (
     # 表名
@@ -85,7 +89,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),