dever 3 years ago
parent
commit
c434d122dc
2 changed files with 12 additions and 5 deletions
  1. 1 1
      service/agent/lib/Order.php
  2. 11 4
      service/agent/src/My.php

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

@@ -186,7 +186,7 @@ class Order
             Dever::alert('验证失败');
         }
         $where['mid'] = $mid;
-        $where['order_id'] = $order_id;
+        $where['id'] = $order_id;
         $info = Dever::db('agent/order')->find($where);
         if (!$info) {
             Dever::alert('验证失败');

+ 11 - 4
service/agent/src/My.php

@@ -368,9 +368,10 @@ class My extends Core
                 }
             }
 
-            $update['sign'] = Dever::input('sign');
-            if (!$update['sign']) {
-                Dever::alert('请填写签名');
+            $sign = Dever::input('sign');
+            if ($sign) {
+                $update['sign'] = $sign;
+                //Dever::alert('请填写签名');
             }
 
             if ($info['pay_type'] == 2) {
@@ -392,7 +393,13 @@ class My extends Core
             
             Dever::db('agent/order')->update($update);
 
-            return 'ok';
+            $this->data['info'] = $info;
+
+            $agreement = Dever::db('setting/agreement')->getData();
+            list($temp, $this->data['user']['agreement_1']) = Dever::load('agent/lib/agreement')->name($agreement[1], $info, $info['role'], 1, 2);
+            list($temp, $this->data['user']['agreement_4']) = Dever::load('agent/lib/agreement')->name($agreement[4], $info, $info['role'], 1, 2);
+
+            return $this->data;
         }
 
         Dever::alert('无申请信息');