ad

app/admin/controller/Action.php

@@ -254,12 +254,12 @@ class Action extends BaseController
                 ->where(['a.menuid' => $value['id'], "a.status" => 1])
                 ->select()
                 ->toArray();
-            $act_data = Db::name("action_field")
-                ->where(['menuid' => $value['id'], "status" => 1])
-                ->select()
-                ->toArray();
+//            $act_data = Db::name("action_field")
+//                ->where(['menuid' => $value['id'], "status" => 1])
+//                ->select()
+//                ->toArray();
             $value['action'] = $act;
-            $value['action_data'] = $act_data;
+            $value['action_data'] =[];
             if (array_key_exists($value['pid'], $result)) {
                 $result[$value['pid']]["child"][] = $value;
             }

app/admin/controller/Sale.php

@@ -5184,7 +5184,7 @@ class Sale extends Base
 					"th_type"=>4,//取消订单
 					"th_num"=>$sale["wsend_num"],
 					"th_fee"=>$sale["total_price"],
-					"th_Code"=>$sale["orderCode"],
+					"thCode"=>$sale["orderCode"],
 					"cat_id"=>$sale["cat_id"],
 					"good_name"=>$sale["good_name"],
 					"spuCode"=>$sale["good_code"],