edit

service/agent/lib/Order.php

@@ -155,10 +155,7 @@ class Order
         if ($data['id']) {
             # 生成代理商
             $result = Dever::load('passport/reg')->getSign($data['mid']);
-            $result['order_id'] = Dever::encode($data['id']);
-            $agreement = Dever::db('setting/agreement')->getData();
-            list($temp, $result['agreement_1']) = Dever::load('agent/lib/agreement')->name($agreement[1], $data, $data['role'], 1, 2);
-            list($temp, $result['agreement_4']) = Dever::load('agent/lib/agreement')->name($agreement[4], $data, $data['role'], 1, 2);
+            //$result['order_id'] = $data['id'];
         	$result['msg'] = '您的申请已经提交完成，请耐心等待，我们将在工作日8小时内为您通过审核，非常感谢。';
         	if ($data['pay_type'] == 3) {
         		$result['bank_msg'] = '您需要使用银行卡：所有人（'.$data['name'].'），账号（'.$data['bank_card'].'），转账至如下账户（'.$data['price_str'].'）:';
@@ -178,22 +175,16 @@ class Order
     }
 
     # 签名确认
-    public function sign()
+    public function sign($mid, $order_id)
     {
-        $mid = Dever::load('passport/user')->check(false);
-        if ($mid <= 0) {
-            Dever::alert('登录失败');
-        }
-        $order_id = Dever::input('order_id');
         if (!$order_id) {
-            Dever::alert('登录失败');
+            Dever::alert('验证失败');
         }
-        $order_id = Dever::decode($order_id);
         $where['mid'] = $mid;
         $where['order_id'] = $order_id;
         $info = Dever::db('agent/order')->find($where);
         if (!$info) {
-            Dever::alert('登录失败');
+            Dever::alert('验证失败');
         }
         if ($info['status'] != -1) {
             Dever::alert('验证失败');

service/agent/src/Auth.php

@@ -80,16 +80,6 @@ class Auth
         }
     }
 
-    /**
-     * 注册验证
-     *
-     * @return mixed
-     */
-    public function sign()
-    {
-        return Dever::load('agent/lib/order')->sign();
-    }
-
     /**
      * 获取手机验证码
      * @return mixed

service/agent/src/My.php

@@ -11,6 +11,18 @@ class My extends Core
     {
         Dever::commend();
     }
+
+    /**
+     * 立即签署
+     *
+     * @return mixed
+     */
+    public function sign()
+    {
+        $order_id = Dever::input('order_id');
+        return Dever::load('agent/lib/order')->sign($this->uid, $order_id);
+    }
+
     /**
      * 获取基本信息
      *
@@ -34,6 +46,12 @@ class My extends Core
                 $order['audit_desc'] = '';
             }
             $this->data['user']['audit_desc'] = $order['audit_desc'];
+
+            if ($order['status'] == -1) {
+                $agreement = Dever::db('setting/agreement')->getData();
+                list($temp, $this->data['user']['agreement_1']) = Dever::load('agent/lib/agreement')->name($agreement[1], $order, $order['role'], 1, 2);
+                list($temp, $this->data['user']['agreement_4']) = Dever::load('agent/lib/agreement')->name($agreement[4], $order, $order['role'], 1, 2);
+            }
         }
         
         return $this->data;