edit

service/agent/lib/Order.php

@@ -1186,7 +1186,7 @@ class Order
                 if (!$child_num) {
                     $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1);
                 }
-                $role_up = Dever::db('setting/role_up')->getData(array('role' => $parent_role['id']));
+                $role_up = Dever::db('setting/role_up')->getData(array('role_id' => $parent_role['id']));
                 if ($role_up) {
                     foreach ($role_up as $rv) {
                         if ($child_num >= $rv['num'] && $group_sell >= $rv['sell']) {
@@ -1316,6 +1316,9 @@ class Order
                 } elseif ($v['type'] == 3) {
                     $prize = Dever::db('setting/prize')->find($v['type_id']);
                     $v['num'] = $v['num'] * $t;
+                    if ($role['max_me_num'] && $role['max_me_num'] > $v['num']) {
+                        $v['num'] = $role['max_me_num'];
+                    }
                     $table['body'][] = array('名额', $prize['name'], $prize['price'], $v['num']);
                 }
             }

service/agent/lib/User.php

@@ -15,6 +15,7 @@ class User
         $id = Dever::input('id');
         $info = Dever::db('agent/user_bind')->one($id);
 
+        /*
         $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="150" /></a>';
         if ($info['idcard_back']) {
             $idcard_pic .= '&nbsp;&nbsp;<a href="'.$info['idcard_back'].'" target="_blank"><img src="'.$info['idcard_back'].'" width="150" /></a>';
@@ -38,6 +39,18 @@ class User
                 ),
             ),
         );
+        */
+
+        $user = Dever::db('passport/user')->find($info['uid']);
+        $result['小程序账号'] = array
+        (
+            'type' => 'info',
+            'content' => array
+            (
+                array('手机号', $user['mobile']),
+                array('昵称', $user['username']),
+            ),
+        );
 
         $member = Dever::db('agent/member')->find($info['mid']);
 
@@ -45,7 +58,8 @@ class User
         	$where['id'] = $member['id'];
         	$where['idcard'] = $member['idcard'];
             $where['status'] = '1,2';
-        	$other = Dever::db('agent/member')->getData($where);
+        	//$other = Dever::db('agent/member')->getData($where);
+        	$other = false;
         	$idcard_pic = '<a href="'.$member['idcard_front'].'" target="_blank"><img src="'.$member['idcard_front'].'" width="150" /></a>';
 	        if ($member['idcard_back']) {
 	            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$member['idcard_back'].'" target="_blank"><img src="'.$member['idcard_back'].'" width="150" /></a>';
@@ -57,22 +71,11 @@ class User
 	            'type' => 'info',
 	            'content' => array
 	            (
-	                array
-	                (
-	                	array('姓名', $member['name']),
-	                    array('手机号', $member['mobile']),
-	                    array('角色', $role['name']),
-	                ),
-
-	                array
-	                (
-	                	array('身份证号', $member['idcard']),
-	                ),
-
-	                array
-	                (
-	                    array('身份证照片', $idcard_pic),
-	                ),
+	            	array('姓名', $member['name']),
+                    array('手机号', $member['mobile']),
+                    array('角色', $role['name']),
+                    array('身份证号', $member['idcard']),
+                    array('身份证照片', $idcard_pic),
 	            ),
 	        );
 
@@ -89,22 +92,11 @@ class User
 			            'type' => 'info',
 			            'content' => array
 			            (
-			                array
-			                (
-			                	array('姓名', $v['name']),
-			                    array('手机号', $v['mobile']),
-			                    array('角色', $role['name']),
-			                ),
-
-			                array
-			                (
-			                	array('身份证号', $v['idcard']),
-			                ),
-
-			                array
-			                (
-			                    array('身份证照片', $idcard_pic),
-			                ),
+			                array('姓名', $v['name']),
+		                    array('手机号', $v['mobile']),
+		                    array('角色', $role['name']),
+		                    array('身份证号', $v['idcard']),
+			                array('身份证照片', $idcard_pic),
 			            ),
 			        );
         		}

service/setting/database/role.php

@@ -186,6 +186,17 @@ return array
             'show'      => 'levelup=1',
         ),
 
+        'max_me_num'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '赠送名额最大值',
+            'default'   => '100',
+            'desc'      => '赠送名额最大值',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            //'list'      => true,
+        ),
+
         'reorder'       => array
         (
             'type'      => 'int-11',