edit

app/shop/lib/Info.php

@@ -249,7 +249,7 @@ class Info
             $page = false;
         }
 
-        $where = 'status = 1 and state = 1';
+        $where = 'status = 1 and state = 1 and type in(1,10) ';
 
         if ($type == 1) {
             $where .= ' and type in (1,2)';

service/agent/lib/Manage.php

@@ -12,6 +12,26 @@ class Manage
         echo $file;die;
     }
 
+    # 生成合同
+    public function createAgreement_api()
+    {
+        $order_id = Dever::input('order_id');
+        $order = Dever::db('agent/order')->find($order_id);
+        if ($order) {
+            $agreement = Dever::db('agent/member_agreement')->getData(array('order_id' => $order['id']));
+            if (!$agreement) {
+                if ($order['sign']) {
+                    $status = 2;
+                } else {
+                    $status = 1;
+                }
+                Dever::load('agent/lib/agreement')->up($order, $status);
+            }
+        }
+        
+        return 'reload';
+    }
+
     public function agentOut($data)
     {
         $file = Dever::input('excel_name');

service/agent/lib/Member.php

@@ -428,6 +428,20 @@ class Member
             'auth' => array('agent.member', 'qydingdan', '权益订单'),
         );
 
+        $order = Dever::db('agent/order')->find(array('mid' => $member['id'], 'order_type' => 1));
+        if ($order) {
+            $agreement = Dever::db('agent/member_agreement')->getData(array('order_id' => $order['id']));
+            if (!$agreement) {
+                $button[2]['btn'][] = array
+                (
+                    'type' => 'action',
+                    'link' => Dever::url('lib/manage.createAgreement?json=1&order_id='.$order['id'], 'agent'),
+                    'name' => '生成代理合同',
+                    'auth' => array('agent.member', 'createAgreement1'),
+                );
+            }
+        }
+
         $button[2]['btn'][] = array
         (
             'type' => 'link',