Browse Source

Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

rabin 3 years ago
parent
commit
050382c179
3 changed files with 26 additions and 5 deletions
  1. 7 2
      service/agent/lib/Dhorder.php
  2. 7 1
      service/agent/lib/Order.php
  3. 12 2
      service/bill/lib/Sell.php

+ 7 - 2
service/agent/lib/Dhorder.php

@@ -795,12 +795,17 @@ class Dhorder
             );
                 
         }
-        
+        $head_btn[] = array
+        (
+            'type' => 'link',
+            'link' => Dever::url('project/database/list?project=agent&table=dh_order&menu=agent&search_option_state=1', 'manage'),
+            'name' => '返回上一页',
+        );
 
         $head = array
         (
             'name' => '基本信息',
-            'btn' => array(),
+            'btn' => $head_btn,
         );
         $html = Dever::show($head, $result);
 

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

@@ -629,7 +629,13 @@ class Order
                 'name' => '确认完成',
             );
         }
-
+        #新加2022.4.8
+        $button[] = array
+        (
+            'type' => 'link',
+            'link' => Dever::url('project/database/list?project=agent&table=order&menu=agent&search_option_state=1', 'manage'),
+            'name' => '返回上一页',
+        );
         return $button;
     }
 

+ 12 - 2
service/bill/lib/Sell.php

@@ -116,12 +116,22 @@ class Sell
                 ),
             )
         );
-
+         $head_btn[] = array
+        (
+            'type' => 'link',
+            'link' => Dever::url('project/database/list?project=bill&table=sell&menu=bill&search_option_state=1', 'manage'),
+            'name' => '返回上一页',
+        );
         $head = array
         (
             'name' => '基本信息',
-            'btn' => array(),
+            'btn' => $head_btn,
         );
+        // $head = array
+        // (
+        //     'name' => '基本信息',
+        //     'btn' => array(),
+        // );
         $html = Dever::show($head, $result);
 
         return $html;