dever 6 years ago
parent
commit
c73bbc5cf9
3 changed files with 5 additions and 3 deletions
  1. 2 1
      act/database/order_temp.php
  2. 1 1
      act/src/Order.php
  3. 2 1
      buy/src/Buy.php

+ 2 - 1
act/database/order_temp.php

@@ -309,7 +309,8 @@ return array
             'option'    => $status,
             'option'    => $status,
             'search'    => 'select',
             'search'    => 'select',
             'update'    => 'radio',
             'update'    => 'radio',
-            'list'      => 'Dever::load("journal/lib/manage.showOrderStatusV1", "{id}")',
+            'list'		=> true,
+            //'list'      => 'Dever::load("journal/lib/manage.showOrderStatusV1", "{id}")',
             'control'   => 'status',
             'control'   => 'status',
         ),
         ),
 
 

+ 1 - 1
act/src/Order.php

@@ -431,7 +431,7 @@ class Order extends Core
 
 
     public function getOrderId($id)
     public function getOrderId($id)
     {
     {
-        $info = Dever::db('act/order')->one($id);
+        $info = Dever::db('act/order_temp')->one($id);
         if ($info['order_id']) {
         if ($info['order_id']) {
             return $info['order_id'] . '/' . $id;
             return $info['order_id'] . '/' . $id;
         }
         }

+ 2 - 1
buy/src/Buy.php

@@ -278,7 +278,7 @@ class Buy extends Base
     public function pay()
     public function pay()
     {
     {
         if (!$this->user) {
         if (!$this->user) {
-            return $this->location('home');
+            //return $this->location('home');
         }
         }
         $uid = $this->user['id'];
         $uid = $this->user['id'];
 
 
@@ -336,6 +336,7 @@ class Buy extends Base
         }
         }
 
 
         $order_id = Dever::load('act/order')->createOrderId($order_data, $id);
         $order_id = Dever::load('act/order')->createOrderId($order_data, $id);
+        echo $order_id;die;
 
 
         //$param参数
         //$param参数
         $param['id'] = $journal_id;
         $param['id'] = $journal_id;