edit

app/shop/database/sell_order.php

@@ -641,7 +641,7 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('id', 'order_id'),
-            'list'      => '"{shop-sell_order_ps-cdate}" ? date("Y-m-d H:i", {shop-sell_order_ps-cdate}) : "-"',
+            'list'      => '"{shop-sell_order_ps-cdate}" ? date("Y-m-d H:i", \'{shop-sell_order_ps-cdate}\') : "-"',
             'list_order' => 8,
         ),
 

app/shop/lib/Sell.php

@@ -1325,12 +1325,12 @@ class Sell
                 $time[] = array('通知时间', $opertime);
             }
             if ($info['status'] == 7) {
-                $time[] = array('取消时间：', $opertime);
+                $time[] = array('取消时间', $opertime);
             }
         }
 
         if ($fdate) {
-            $time[] = array('完成时间：', $fdate);
+            $time[] = array('完成时间', $fdate);
         }
 
         $result = array();

service/agent/lib/Import.php

@@ -94,6 +94,7 @@ class Import
                 if (!$data['name']) {
                     $data['name'] = 'boss';
                 }
+                $data['password'] = $v['pwd'];
                 $data['avatar'] = $v['avatar'];
                 $data['username'] = $v['nickname'];
                 $data['mid'] = $v['id'];

service/agent/lib/Member.php

@@ -220,24 +220,21 @@ class Member
             }
         }
 
-        $idcard_pic = '<a href="'.$member['idcard_front'].'" target="_blank"><img src="'.$member['idcard_front'].'" width="100" /></a>';
+        $idcard_pic = '<a class="dever-img" href="'.$member['idcard_front'].'"><img src="'.$member['idcard_front'].'" width="100" /></a>';
         if ($member['idcard_back']) {
-            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$member['idcard_back'].'" target="_blank"><img src="'.$member['idcard_back'].'" width="100" /></a>';
+            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$member['idcard_back'].'"><img src="'.$member['idcard_back'].'" width="100" /></a>';
         }
         $member_name = $member['name'];
         $member_number = $member['idcard'];
 
         $result['认证信息'] = array
         (
-            'type' => 'info',
+            'type' => 'user',
             'content' => array
             (
-                array
-                (
-                    array('类型', $config_type[$member['type']]),
-                    array('姓名', $member_name),
-                    array('身份证号', $member_number),
-                ),
+                array('类型', $config_type[$member['type']]),
+                array('姓名', $member_name),
+                array('身份证号', $member_number),
             ),
         );
 
@@ -246,18 +243,12 @@ class Member
             $member_name = $member['company_name'];
             $member_number = $member['company_number'];
 
-            $result['认证信息']['content'][] = array
-            (
-                array('企业名称', $member_name),
-                array('营业执照', $member_number),
-                array('营业执照照片', $company_pic),
-            );
+            $result['认证信息']['content'][] = array('企业名称', $member_name);
+            $result['认证信息']['content'][] = array('营业执照', $member_number);
+            $result['认证信息']['content'][] = array('营业执照照片', $company_pic);
         }
 
-        $result['认证信息']['content'][] = array
-        (
-            array('身份证照片', $idcard_pic),
-        );
+        $result['认证信息']['content'][] = array('身份证照片', $idcard_pic);
 
         $button = array();
         if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit', '修改基础资料')) {
@@ -429,12 +420,12 @@ class Member
             'btn' => $head_btn,
         );
         $foot = $button;
-        $html = Dever::show($head, $result, $foot);
+        $html = Dever::show($head, $result, $foot, false, 'dls-user-box');
 
         return $html;
     }
 
-    private function getShowInfo($member)
+    public function getShowInfo($member)
     {
         $role = Dever::db('setting/role')->one($member['role']);
         $level = Dever::db('setting/level')->one($member['level_id']);
@@ -466,31 +457,26 @@ class Member
             $member['group_sell'] = 0;
         }
 
+        if (!$member['avatar']) {
+            $default = Dever::db('passport/avatar')->one(1);
+            $member['avatar'] = $default['avatar'];
+        }
+
         $result = array
         (
-            'type' => 'info',
+            'type' => 'user',
+            'pic' => $member['avatar'],
             'content' => array
             (
-                array
-                (
-                    array('代理商姓名', $member['name']),
-                    array('手机号', $member['mobile']),
-                    array('邀请码', $code),
-                ),
-
-                array
-                (
-                    array('代理角色', $role['name']),
-                    array('代理区域', $area),
-                    array('所属店铺', $shop['name']),
-                ),
-
-                array
-                (
-                    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>'),
-                ),
+                $member['name'],
+                array('手机号', $member['mobile']),
+                array('邀请码', $code),
+                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>'),
             ),
         );
 

service/agent/lib/Order.php

@@ -427,30 +427,24 @@ class Order
 
         $result = array();
 
-        $status_value = array();
-
-        if ($process) {
-            foreach ($process as $k => $v) {
-                $v['cdate'] = date('Y-m-d H:i', $v['cdate']);
-                $status_value[] = array($process_status[$v['status']], $v['cdate']);
-            }
-        }
-
         $result[$info['order_num']] = array
         (
-            'type' => 'info',
+            'type' => 'user',
             'content' => array
             (
-                array
-                (
-                    array('订单状态', $status),
-                    array('申请日期', $cdate),
-                    array('管理员备注', $info['admin_desc']),
-                ),
-                $status_value,
+                array('订单状态', $status),
+                array('申请日期', $cdate),
+                array('管理员备注', $info['admin_desc']),
             )
         );
 
+        if ($process) {
+            foreach ($process as $k => $v) {
+                $v['cdate'] = date('Y-m-d H:i', $v['cdate']);
+                $result[$info['order_num']]['content'][] = array($process_status[$v['status']], $v['cdate']);
+            }
+        }
+
         $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="100" /></a>';
         if ($info['idcard_back']) {
             $idcard_pic .= '&nbsp;&nbsp;<a href="'.$info['idcard_back'].'" target="_blank"><img src="'.$info['idcard_back'].'" width="100" /></a>';
@@ -472,27 +466,17 @@ class Order
 
         $result['账号信息'] = array
         (
-            'type' => 'info',
+            'type' => 'user',
             'content' => array
             (
-                array
-                (
-                    array('类型', $config['type'][$info['type']]),
-                    array('姓名', $info['name']),
-                    array('手机号', $info['mobile']),
-                ),
-
-                array
-                (
-                    array('代理角色', $role['name']),
-                    array('代理区域', $area),
-                    //array('注意', '赠送区域无权益'),
-                ),
-
-                array
-                (
-                    array('身份证号码', $info['idcard']),
-                ),
+                array('类型', $config['type'][$info['type']]),
+                array('姓名', $info['name']),
+                array('手机号', $info['mobile']),
+
+                array('代理角色', $role['name']),
+                array('代理区域', $area),
+                //array('注意', '赠送区域无权益'),
+                array('身份证号码', $info['idcard']),
             ),
         );
 
@@ -506,42 +490,34 @@ class Order
             );
         }
 
-        $result['账号信息']['content'][] = array
-        (
-            array('身份证照片', $idcard_pic),
-            array('代理商签名', $sign_pic),
-        );
+        $result['账号信息']['content'][] = array('身份证照片', $idcard_pic);
+        $result['账号信息']['content'][] = array('代理商签名', $sign_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['支付信息'] = array
         (
-            'type' => 'info',
+            'type' => 'user',
             'content' => array
             (
-                array
-                (
-                    array('支付方式', $config['pay_type'][$info['pay_type']]),
-                    array('支付状态', $config['pay_status'][$info['pay_status']]),
-                    array('付款备注', $info['desc']),
-                ),
+                array('支付方式', $config['pay_type'][$info['pay_type']]),
+                array('支付状态', $config['pay_status'][$info['pay_status']]),
+                array('付款备注', $info['desc']),
 
-                array
-                (
-                    array('应付金额', '¥' . $info['f_price'] . '元'),
-                    array('实付金额', '¥' . $info['price'] . '元'),
-                    array('代理费', '¥' . $info['agent_cash'] . '元'),
-                ),
+                array('应付金额', '¥' . $info['f_price'] . '元'),
+                array('实付金额', '¥' . $info['price'] . '元'),
+                array('代理费', '¥' . $info['agent_cash'] . '元'),
 
-                array
-                (
-                    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
-                (
-                    array('支付凭证', $pay_pic),
-                ),
+                array('支付凭证', $pay_pic),
             ),
         );
 
@@ -573,7 +549,7 @@ class Order
             'name' => '基本信息',
             'btn' => $button,
         );
-        $html = Dever::show($head, $result);
+        $html = Dever::show($head, $result, false, false, 'dls-user-box');
 
         return $html;
     }
@@ -798,21 +774,23 @@ class Order
                     $param['parent_level'] = $level['id'];
                     $param['child_num'] = $child_num;
                 }
-                if ($parent_level['id'] && $parent_level['value'] > 0 && $cash > 0) {
-                    $param['cash'] = $cash;
-                    $param['per'] = $parent_level['value'];
+                if ($parent_per < $max_per) {
+                    if ($parent_level['id'] && $parent_level['value'] > 0 && $cash > 0) {
+                        $param['cash'] = $cash;
+                        $param['per'] = $parent_level['value'];
 
-                    $data_param = Dever::array_encode($param);
+                        $data_param = Dever::array_encode($param);
 
-                    $cash = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $cash . '</a>';
+                        $cash = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $cash . '</a>';
 
-                    $table['body'][] = array($parent_info['name'], $parent_role['name'], $parent_level['name'], $parent_level['value'] . '%', $cash);
-                } else {              
-                    $param['cash'] = 0;
-                    $param['per'] = 0;
-                    $data_param = Dever::array_encode($param);
+                        $table['body'][] = array($parent_info['name'], $parent_role['name'], $parent_level['name'], $parent_level['value'] . '%', $cash);
+                    } else {              
+                        $param['cash'] = 0;
+                        $param['per'] = 0;
+                        $data_param = Dever::array_encode($param);
 
-                    $html .= '<a style="color:blue;display:none;" class="set_cash" data-param="'.$data_param.'">&nbsp;&nbsp;</a>';
+                        $html .= '<a style="color:blue;display:none;" class="set_cash" data-param="'.$data_param.'">&nbsp;&nbsp;</a>';
+                    }
                 }
             }
         }

service/agent/src/Auth.php

@@ -25,7 +25,7 @@ class Auth
         if (!$user) {
             Dever::alert('登录失败，手机号错误，请重新输入');
         }
-        if ($pass && $user['password'] != sha1($pass)) {
+        if ($pass && ($user['password'] != sha1($pass) || $user['password'] != md5($pass))) {
             Dever::alert('登录失败，密码错误，请重新输入');
         }