edit

service/agent/assets/pc/html/setOrderGoods.html

@@ -21,8 +21,12 @@
     <div class="layui-row">
         <div class="main_left layui-col-xs12 layui-col-md3">
             <div class="layui-row">
+            <div class="back">
+                </div>
                 <div class="top">
                     <i class="layui-icon layui-icon-app"></i>商品列表
+                    
+                    <a class="mini-button" onclick="javascript:history.back()">返回上一页</a>
                 </div>
                 <div class="left_main">
                     <input id="key" class="mini-textbox" placeholder="请输入商品名称" onenter="onKeyEnter"/>

service/agent/database/member.php

@@ -284,6 +284,7 @@ return array
             'match'     => 'option',
             //'update'    => 'text',
             'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("invite/api.code", {id})',
+            'list_order'=>1,
         ),
 
         'role'      => array

service/agent/database/order.php

@@ -249,7 +249,8 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => 'fulltext',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/order")',
+            'list'      => 'Dever::load("agent/lib/order.new_set",{id})',
+            // 'Dever::load("agent/lib/member.getOne", {id}, "agent/order")',
             'list_order' => 3,
         ),
 
@@ -276,7 +277,7 @@ return array
             'search'    => 'linkage',
             'update'    => 'linkage',
             'option'    => Dever::url('api.get?level_total=4', 'area'),
-            'list'      => 'Dever::load("area/api.string", "{area}")',
+            // 'list'      => 'Dever::load("area/api.string", "{area}")',
         ),
 
         'desc'      => array

service/agent/lib/Order.php

@@ -1062,4 +1062,11 @@ class Order
         $html=Dever::table($data);
         return $html;
     }
+    public function new_set($id){
+        $info = Dever::db('agent/order')->find($id);
+        $name = Dever::load("agent/lib/member.getOne", $id, "agent/order");
+        $area = Dever::load("area/api.string", $info['area']);
+        $html = $name.'<br/>'.$area;
+        return $html;
+    }
 }

service/bill/lib/Cash.php

@@ -222,10 +222,16 @@ class Cash
                 
             }
         }
+        $menu_id = Dever::input('menu_id');
+        if($menu_id == 137){
+             $url = Dever::url('project/database/list&project=bill&table=tixian&menu=bill&search_option_state=1&menu_id=252', 'manage');
+         }elseif($menu_id == 132){
+            $url = Dever::url('project/database/list&project=bill&table=cash&menu=bill&search_option_state=1&menu_id=245', 'manage');
+         }
          $button[] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=tixian&menu=bill&search_option_state=1', 'manage'),
+            'link' => $url,
             'name' => '返回上一页',
         );
         $head = array