园区模糊搜索

application/admin/controller/City.php

@@ -64,7 +64,6 @@ class City extends Backend
 
             foreach ($list as $row) {
                 $row->visible(['id','name','create_time']);
-                
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/admin/controller/Meeting.php

@@ -65,7 +65,6 @@ class Meeting extends Backend
                 $row->getRelation('city')->visible(['name']);
 				$row->getRelation('parklists')->visible(['name']);
             }
-
             $result = array("total" => $list->total(), "rows" => $list->items());
 
             return json($result);
@@ -77,7 +76,7 @@ class Meeting extends Backend
     {
 //        $data = Db::name('city')->field('id,name')->select();
         $res = [
-            ['id' =>'00:00-01:00','name' =>'00:00-01:00'],
+            ['id' =>'00:01-01:00','name' =>'00:01-01:00'],
             ['id' =>'01:00-02:00','name' =>'01:00-02:00'],
             ['id' =>'02:00-03:00','name' =>'02:00-03:00'],
             ['id' =>'03:00-04:00','name' =>'03:00-04:00'],
@@ -100,7 +99,7 @@ class Meeting extends Backend
             ['id' =>'20:00-21:00','name' =>'20:00-21:00'],
             ['id' =>'21:00-22:00','name' =>'21:00-22:00'],
             ['id' =>'22:00-23:00','name' =>'22:00-23:00'],
-            ['id' =>'23:00-00:00','name' =>'23:00-00:00'],
+            ['id' =>'23:00-23:59','name' =>'23:00-23:59'],
         ];
         if($this->request->request("keyValue")){
             $keyValue = $this->request->request("keyValue");

application/admin/model/Meeting.php

@@ -44,6 +44,6 @@ class Meeting extends Model
 
     public function parklists()
     {
-        return $this->belongsTo('app\admin\model\park\Lists', 'id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('app\admin\model\park\Lists', 'p_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

application/admin/model/office/Lists.php

@@ -45,6 +45,6 @@ class Lists extends Model
 
     public function parklists()
     {
-        return $this->belongsTo('app\admin\model\park\Lists', 'id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('app\admin\model\park\Lists', 'p_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

application/admin/view/meeting/add.html

@@ -111,12 +111,12 @@
             <textarea id="c-content" data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Switch')}:</label>
-        <div class="col-xs-12 col-sm-8">
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Switch')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
             <input id="c-switch" data-rule="required" class="form-control" name="row[switch]" type="hidden" value="1">
-        </div>
-    </div>
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Meeting.php

@@ -142,9 +142,9 @@ class Meeting extends Api
 
         $count = count($data['xiuxiri_shijian_ids']);
 
-        $data['xiuxi_start_time'] = $data['xiuxiri_shijian_ids'][0];
+        $data['xiuxi_start_time'] = substr($data['xiuxiri_shijian_ids'][0],0,5);
 
-        $data['xiuxi_start_end'] = $data['xiuxiri_shijian_ids'][$count - 1];
+        $data['xiuxi_start_end'] = substr($data['xiuxiri_shijian_ids'][$count - 1],6,10);
 
         $user = $this->auth->getUser();
 

application/api/controller/User.php

@@ -23,14 +23,6 @@ class User extends Api
     }
 
     /**
-     * 会员中心
-     */
-    public function index()
-    {
-        $this->success('', ['welcome' => $this->auth->nickname]);
-    }
-
-    /**
      * 会员登录
      *
      * @param string $account 账号
@@ -150,6 +142,118 @@ class User extends Api
     }
 
     /**
+     * 重置密码
+     *
+     * @param string $mobile 手机号
+     * @param string $newpassword 新密码
+     * @param string $captcha 验证码
+     */
+    public function resetpwd()
+    {
+        $mobile = $this->request->request("mobile");
+        $newpassword = $this->request->request("newpassword");
+        $captcha = $this->request->request("captcha");
+        if (!$newpassword || !$captcha) {
+            $this->error(__('Invalid parameters'));
+        }
+
+        if (!Validate::regex($mobile, "^1\d{10}$")) {
+            $this->error(__('Mobile is incorrect'));
+        }
+        $user = \app\common\model\User::getByMobile($mobile);
+        if (!$user) {
+            $this->error(__('User not found'));
+        }
+//        $ret = session($mobile);
+        $ret = Db::name('captcha')->where('mobile',$mobile)->order('create_time desc')->find();
+        if (!$ret) {
+            $this->error(__('Captcha is incorrect'));
+        }
+        if ($ret) {
+            if ($ret['number'] != $captcha) {
+                $this->error('验证码不正确');
+            }
+            if(time()-$ret['create_time'] > 300) {
+                $this->error('验证码超时');
+            }
+        }
+
+        //模拟一次登录
+        $this->auth->direct($user->id);
+        $rets = $this->auth->changepwd($newpassword, '', true);
+        if ($rets) {
+            $this->success(__('Reset password successful'));
+        } else {
+            $this->error($this->auth->getError());
+        }
+    }
+
+    /**
+     * 发送验证码
+     *
+     * @param string $mobile 手机号
+     * @param string $type 1注册2忘记3修改密码
+     */
+    public function sendPhone()
+    {
+
+        $mobile = $this->request->param('mobile');
+
+        $type = $this->request->param('type');
+        if (!isset($type) || empty($type)) return $this->error('参数错误');
+
+        if ($type == 1) {
+            $issetphone = Db::name('user')->where('mobile', $mobile)->find();
+
+            if (isset($issetphone)) return $this->error('此账号已存在');
+        }
+        if ($type == 3) {
+            $user = $this->auth->getUser();
+
+            $isuseourphone = Db::name('user')->where('id', $user['id'])->where('mobile', $mobile)->find();
+
+            if (!$isuseourphone) return $this->error('请使用本账号手机号修改密码');
+        }
+        $number = rand(1000, 9999);
+
+        $res = send_sms($mobile, 1, ['code' => $number]);
+        if (isset($res['Message']) && $res['Message'] == "OK") {
+            $data = [
+                'mobile' =>$mobile,
+                'number' =>$number,
+                'create_time' =>time(),
+            ];
+            Db::name('captcha')->insert($data);
+            return $this->success('发送成功', $number);
+        } else {
+            return $this->error('发送失败');
+        }
+    }
+
+
+    /**
+     * 用户信息
+     */
+
+    public function userInfo()
+    {
+        $user = $this->auth->getUser();
+
+        dump($user);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
      * 退出登录
      */
     public function logout()
@@ -261,98 +365,4 @@ class User extends Api
         return $openid;
 
     }
-    /**
-     * 重置密码
-     *
-     * @param string $mobile 手机号
-     * @param string $newpassword 新密码
-     * @param string $captcha 验证码
-     */
-    public function resetpwd()
-    {
-//        $type = $this->request->request("type");
-        $type = "mobile";
-        $mobile = $this->request->request("mobile");
-        $email = $this->request->request("email");
-        $newpassword = $this->request->request("newpassword");
-        $captcha = $this->request->request("captcha");
-        if (!$newpassword || !$captcha) {
-            $this->error(__('Invalid parameters'));
-        }
-
-        if (!Validate::regex($mobile, "^1\d{10}$")) {
-            $this->error(__('Mobile is incorrect'));
-        }
-        $user = \app\common\model\User::getByMobile($mobile);
-        if (!$user) {
-            $this->error(__('User not found'));
-        }
-//        $ret = session($mobile);
-        $ret = Db::name('captcha')->where('mobile',$mobile)->order('create_time desc')->find();
-        if (!$ret) {
-            $this->error(__('Captcha is incorrect'));
-        }
-        if ($ret) {
-            if ($ret['number'] != $captcha) {
-                $this->error('验证码不正确');
-            }
-            if(time()-$ret['create_time'] > 300) {
-                $this->error('验证码超时');
-            }
-        }
-
-        //模拟一次登录
-        $this->auth->direct($user->id);
-        $rets = $this->auth->changepwd($newpassword, '', true);
-        if ($rets) {
-            $this->success(__('Reset password successful'));
-        } else {
-            $this->error($this->auth->getError());
-        }
-    }
-
-    /**
-     * 发送验证码
-     *
-     * @param string $mobile 手机号
-     * @param string $type 1注册2忘记3修改密码
-     */
-    public function sendPhone()
-    {
-
-        $mobile = $this->request->param('mobile');
-
-        $type = $this->request->param('type');
-        if (!isset($type) || empty($type)) return $this->error('参数错误');
-
-        if ($type == 1) {
-            $issetphone = Db::name('user')->where('mobile', $mobile)->find();
-
-            if (isset($issetphone)) return $this->error('此账号已存在');
-        }
-        if ($type == 3) {
-            $user = $this->auth->getUser();
-
-            $isuseourphone = Db::name('user')->where('id', $user['id'])->where('mobile', $mobile)->find();
-
-            if (!$isuseourphone) return $this->error('请使用本账号手机号修改密码');
-        }
-        $number = rand(1000, 9999);
-
-        $res = send_sms($mobile, 1, ['code' => $number]);
-        if (isset($res['Message']) && $res['Message'] == "OK") {
-            $data = [
-                'mobile' =>$mobile,
-                'number' =>$number,
-                'create_time' =>time(),
-            ];
-            Db::name('captcha')->insert($data);
-            return $this->success('发送成功', $number);
-        } else {
-            return $this->error('发送失败');
-        }
-//        $send->index($mobile,$number);
-//        return $this->success('',$number);
-
-    }
 }