带看ID

application/index/controller/ImageDepot.php

@@ -177,17 +177,27 @@ class ImageDepot extends Basic
         echo 'Mac地址：'.$mac_address;
     }
 
-    public function ceshi(){
-
-        $time = time();
-        $begin_date = date("Y-m-d H:i:s", $time - 1800);
-        $end_date = date("Y-m-d H:i:s", $time);
+    public function ceshi()
+    {
 
-        echo $time . '</br>';
-        echo $begin_date . '</br>';
-        echo $end_date . '</br>';
+        echo $this->systemDiskInfo();
+    }
 
+    /**
+     * 系统磁盘使用详情
+     * @return string
+     */
+    public function systemDiskInfo(){
+        //硬盘
+        $dt = round(@disk_total_space(".") / (1024 * 1024 * 1024), 3); //总
+        $df = round(@disk_free_space(".") / (1024 * 1024 * 1024), 3); //可用
+        $du = $dt - $df; //已用
+        $hdPercent = (floatval($dt) != 0) ? round($du / $dt * 100, 2) : 0;
+
+        $about = '总空间' . $dt.'G 已用' . $du.'G 空闲' . $df.'G 使用率' . $hdPercent.'%';
+        return $about;
     }
 
+
 }
 

application/index/controller/MarchIn.php

@@ -88,6 +88,11 @@ class MarchIn extends Basic
         if (isset($params['shop_type']) && $params['shop_type'] != -1) {
             $where['f.shop_type']           = $params['shop_type'] ;
         }
+
+        //10.带看ID
+        if (!empty($params['order_id'])) {
+            $where['a.order_id']           = $params['order_id'] ;
+        }
         //搜索条件 end
 
         $fields_evaluate = 'a.id,a.report_id,a.order_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,';