1

application/index/controller/StoreFee.php

@@ -32,12 +32,12 @@ class StoreFee extends Basic
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
 
-        $params = array(
-            "site_id" => '10001',//站点id
-            "office_name"  => '鳖',//办公室名
-            "office_address"  =>'上海市黄浦区龙华东路800号',//办公室地址
-            "rent"  => 5000,//租金每月
-        );
+        // $params = array(
+        //     "site_id" => '10001',//站点id
+        //     "office_name"  => '鳖',//办公室名
+        //     "office_address"  =>'上海市黄浦区龙华东路800号',//办公室地址
+        //     "rent"  => 5000,//租金每月
+        // );
 
         $checkResult = $this->validate($params, "StoreFeeValidate.addOffice");
         if (true !== $checkResult) {
@@ -61,59 +61,31 @@ class StoreFee extends Basic
 
     }
 
-    // /**
-    //  * 获取站点列表
-    //  * User: 朱伟
-    //  * Date:2018-10-18
-    //  * Time:10:50:55
-    //  */
-    // public function getSiteList()
-    // {
-    //     $params = $this->params;
-    //
-    //     /*$params = array(
-    //         "id" => 5740
-    //     );*/
-    //
-    //     $field = 'id,name,city,is_del';
-    //
-    //     if ($params['is_del']) {
-    //         $params['is_del'] = 0;
-    //     }
-    //
-    //     $res = $this->aSite->getSite($field, $params);
-    //     $data['list'] = $res;
-    //
-    //     return $this->response("200", "成功", $data);
-    // }
-    //
-    //
-    //
-    // /**
-    //  * 关闭或开启站点
-    //  * @return \think\Response
-    //  */
-    // public function delImageDepot(){
-    //     $params = $this->params;
-    //     $checkResult = $this->validate($params, "Site.delImageDepot");
-    //     if (true !== $checkResult) {
-    //         return $this->response("101", $checkResult);
-    //     }
-    //     $params_['id'] = $params['id'];
-    //     $params_['is_del'] = $params['is_del'];
-    //     $res = $this->aSite->updateSite($params_);//int(1)
-    //     if($res == 1){
-    //         return $this->response("200", "成功",['data'=>$res]);
-    //     }else{
-    //         return $this->response("300", "失败");
-    //     }
-    // }
-    //
-    // public function siteLogList()
-    // {
-    //     if (!$this->request->isAjax()) {
-    //         return view('site/siteLogList');
-    //     }
-    // }
+    /**
+     * 办公室列表
+     * @return \think\Response
+     */
+    public function getSiteList()
+    {
+        $params = $this->params;
+
+        /*$params = array(
+            "id" => 5740
+        );*/
+
+        $field = 'id,name,city,is_del';
+
+        if ($params['is_del']) {
+            $params['is_del'] = 0;
+        }
+
+        $res = $this->f_office->getOffice($field, $params);
+        $data['list'] = $res;
+
+        return $this->response("200", "成功", $data);
+    }
+
+
+
 
 }
\ No newline at end of file

application/model/FOffice.php

@@ -32,7 +32,9 @@ class FOffice extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
+     * @param $field
+     * @param $params
+     * @return array|false|\PDOStatement|string|Model
      */
     public function findByOne($field,$params) {
         $result = $this->db_
@@ -44,23 +46,22 @@ class FOffice extends BaseModel
     }
 
 
-
-    //
-    //
-    // /**
-    //  * 查询数据
-    //  * 朱伟 2018-10-18 10:41:10
-    //  */
-    // public function getOffice($field,$params)
-    // {
-    //     $result = $this->db_
-    //         ->field($field)
-    //         //->alias('a')
-    //         ->where($params)
-    //         ->select();
-    //     //dump($this->db_->getLastSql());
-    //     return $result;
-    // }
+    /**
+     * 查询数据
+     * @param $field
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function getOffice($field,$params)
+    {
+        $result = $this->db_
+            ->field($field)
+            //->alias('a')
+            ->where($params)
+            ->select();
+        //dump($this->db_->getLastSql());
+        return $result;
+    }
     //
     // /**
     //  * 更新数据