dever 3 gadi atpakaļ
vecāks
revīzija
4870683b31

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

@@ -471,8 +471,8 @@ return array
             'desc'      => '是否导入数据',
             'match'     => 'is_numeric',
             'option'    => $import,
-            'search'    => 'select',
-            'list'      => true,
+            //'search'    => 'select',
+            //'list'      => true,
         ),
 
         'state'     => array

+ 2 - 1
service/agent/lib/Agreement.php

@@ -24,6 +24,7 @@ class Agreement
             # 获取当前登录的uid
             $mid = Dever::load('passport/user')->check(false);
             if (!$mid || $mid <= 0) {
+                //$mid = 1000000;
                 Dever::alert('请先登录');
             }
 			
@@ -125,7 +126,7 @@ class Agreement
 		$agreement = Dever::db('setting/agreement')->getData();
 		$role = Dever::db('setting/role')->find($order['role']);
         foreach ($agreement as $k => $v) {
-        	if ($k == 5) {
+        	if ($k >= 5) {
         		continue;
         	}
         	if ($k == 2 && $order['order_type'] == 1) {

+ 1 - 1
service/agent/lib/Member.php

@@ -457,7 +457,7 @@ class Member
             $insert['parent_mid'] = $data['parent_mid'];
             $insert['source_id'] = $data['source_id'];
             $insert['type'] = $data['type'];
-            $mid = Dever::db('agent/member')->insert($data);
+            $mid = Dever::db('agent/member')->insert($insert);
             if ($mid && $data['parent_mid'] && $data['parent_mid'] > 0) {
                 Dever::load('invite/api')->setRelation($mid, $data['parent_mid']);
             }

+ 12 - 3
service/agent/lib/Order.php

@@ -198,7 +198,7 @@ class Order
         if ($info['status'] != -1) {
             Dever::alert('验证失败');
         }
-        $update['sign'] = Dever::input('sign');
+        $update['sign'] = $sign = Dever::input('sign');
         if (!$update['sign']) {
             Dever::alert('请上传签名');
         }
@@ -206,6 +206,10 @@ class Order
         $update['where_id'] = $info['id'];
         $state = Dever::db('agent/order')->update($update);
         if ($state) {
+            $update = array();
+            $update['sign'] = $sign;
+            $update['where_id'] = $mid;
+            $state = Dever::db('agent/member')->update($update);
             $result = Dever::load('passport/reg')->getSign($mid);
             return $result;
         } else {
@@ -430,7 +434,12 @@ class Order
         if ($info['idcard_back']) {
             $idcard_pic .= '&nbsp;&nbsp;<a href="'.$info['idcard_back'].'" target="_blank"><img src="'.$info['idcard_back'].'" width="150" /></a>';
         }
-        $sign_pic = '<a href="'.$info['sign'].'" target="_blank"><img src="'.$info['sign'].'" width="150" /></a>';
+        if ($info['sign']) {
+            $sign_pic = '<a href="'.$info['sign'].'" target="_blank"><img src="'.$info['sign'].'" width="150" /></a>';
+        } else {
+            $sign_pic = '暂无';
+        }
+        
 
         $pay_pic = '';
         if ($info['pay_pic']) {
@@ -551,7 +560,7 @@ class Order
             //$soft = '【<a href="" style="color:blue">拆分代理费</a>】';
         }
 
-        if ($info['status'] <= 3) {
+        if ($info['status'] <= 3 && $info['status'] > 0) {
             # 未完成审核的订单,可以随时挂起
             $button[] = array
             (