rabin 3 년 전
부모
커밋
9ac037adbb
4개의 변경된 파일25개의 추가작업 그리고 19개의 파일을 삭제
  1. 3 3
      service/agent/database/member.php
  2. 8 8
      service/agent/database/order.php
  3. 9 6
      service/agent/lib/Member.php
  4. 5 2
      service/agent/lib/Order.php

+ 3 - 3
service/agent/database/member.php

@@ -97,7 +97,7 @@ if ($search_api_parent_mid && $getInfo != 1) {
         //'返回上一页' => array('onclick', 'history.back()'),
     );
 }
- $list_button = array();
+$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'));
@@ -147,7 +147,7 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {id})',
+            'list'      => 'Dever::load("agent/lib/member.new_set", {id})',
         ),
 
         'rdate'     => array
@@ -320,7 +320,7 @@ return array
             'search'    => 'linkage',
             'update'    => 'linkage',
             'option'    => Dever::url('api.get?level_total=4', 'area'),
-            'list'      =>($pmid) ? false: 'Dever::load("area/api.string", "{area}")',
+            //'list'      =>($pmid) ? false: 'Dever::load("area/api.string", "{area}")',
         ),
 
         'is_shop'        => array

+ 8 - 8
service/agent/database/order.php

@@ -32,13 +32,13 @@ $source_id = function()
 
 $status = array
 (
-    -2 => '待签名',
-    1 => '待业务初审',
-    2 => '待财务终审',
-    3 => '待权益发放',
+    -2 => array('name' => '待签名', 'style' => 'font-weight:bold;color:#00FFFF'),
+    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:#436EEE'),
     4 => array('name' => '已完成', 'style' => 'font-weight:bold;color:green'),
-    5 => '驳回',
-    6 => '挂起',
+    5 => array('name' => '驳回', 'style' => 'font-weight:bold;color:#CD3700'),
+    6 => array('name' => '挂起', 'style' => 'font-weight:bold;color:#436EEE'),
 );
 
 $pay_status = array
@@ -670,7 +670,7 @@ return array
             'desc'      => '',
             # 只有insert时才生效
             'insert'    => true,
-            'search'    => 'date',
+            //'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})',
@@ -700,7 +700,7 @@ return array
         'list_button' => array
         (
             //fast_list
-            'list' => array('查看详情', '"order_process&project=agent&order_id={id}&page_type=1"'),
+            'list' => array('查看详情', '"order_process&project=agent&order_id={id}&page_type=1&[refer]"'),
 
             //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),
             //'delete' => array('删除', '', '{status} == 1'),

+ 9 - 6
service/agent/lib/Member.php

@@ -14,10 +14,16 @@ class Member
         $member = Dever::db($table)->find($id);
         if ($member) {
             $member['role'] = Dever::db('setting/role')->find($member['role']);
-            $url = Dever::url('project/database/list?project=agent&table=member&search_option_pmid=-1&search_option_parent_mid='.$member['id'].'&' . Dever::refer('manage'), '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>';
-            $string = $member['name'] . '<br />' . $member['mobile'] . '<br />' . $member['role']['name'];
+            $code = Dever::load("invite/api.code", $member['id']);
+            $string = '';
+            if ($code) {
+                $string = '[' . $code . ']<br />';
+            }
+
+            $string .= $member['name'] . '<br />' . $member['mobile'] . '<br />' . $member['role']['name'];
             
             if (isset($member['level_id']) && $member['level_id'] && $member['level_id'] > 0) {
                 $member['level'] = Dever::db('setting/level')->find($member['level_id']);
@@ -27,10 +33,7 @@ class Member
             if($source){
                 $string .= '<br/>'.$source['name'];
             }
-            $code = Dever::load("invite/api.code", $member['id']);
-            if ($code) {
-                $string .= '<br />[' . $code . ']';
-            }
+            
             return $string;
             
         } else {

+ 5 - 2
service/agent/lib/Order.php

@@ -464,7 +464,10 @@ class Order
 
         $pay_pic = '';
         if ($info['pay_pic']) {
-            $pay_pic = '&nbsp;&nbsp;<a href="'.$info['pay_pic'].'" target="_blank"><img src="'.$info['pay_pic'].'" width="100" /></a>';
+            $temp = explode(',', $info['pay_pic']);
+            foreach ($temp as $k => $v) {
+                $pay_pic .= '&nbsp;&nbsp;<a href="'.$v.'" target="_blank"><img src="'.$v.'" width="100" /></a>';
+            }
         }
 
         $result['账号信息'] = array
@@ -709,7 +712,7 @@ class Order
         $button[] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&menu=agent&search_option_state=1', 'manage'),
+            'link' => 'refer',
             'name' => '返回上一页',
         );
         return $button;