Merge remote-tracking branch 'origin/master'

3 лет назад · 1366ab6244
--- a/application/admin/controller/CfRoomInfo.php
+++ b/application/admin/controller/CfRoomInfo.php
@@ -178,11 +178,10 @@ class CfRoomInfo extends Backend
    }

    public function getRoomList(){
        $hotelId=$this->request->post('hotelId');
        $hotelId=$this->request->get('hotelId');
        $result=  $this->model
            ->field("id,room_name as name")
            ->field("id,room_name as name,room_memo")
            ->where("hotel_id","=",$hotelId)->select();

        return json(['list' => $result]);
    }

--- a/application/admin/controller/CfRoomPlan.php
+++ b/application/admin/controller/CfRoomPlan.php
@@ -51,12 +51,16 @@ class CfRoomPlan extends Backend
    public function getList(){
        $name=$this->request->post('name');
        $keyValue=$this->request->post('keyValue');
        $this->model->field('id,plan_name as name,purchase_user_id');
        $this->model->field('id,plan_name as name,purchase_user_id,plan_memo');
        if($keyValue){
            $this->model->where(['id'=>$keyValue]);
        }elseif($name){
            $this->model->where(['plan_name'=>['like','%'.$name.'%']]);
        }
        $roomId =$this->request->get('room_id');
        if ($roomId){
            $this->model->where("room_id","=",$roomId);
        }
        $result= $this->model->select();
        if($keyValue){
            return json(['list' => $result]);
--- a/application/admin/view/order_main/add.html
+++ b/application/admin/view/order_main/add.html
@@ -1,4 +1,4 @@
 <script>
    window.id = ''
 </script>
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.698786fe542a37ae30fce78443ce5c30.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.4ea76294a6c0a4c152e8.js></script></body></html>
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.d568dd9d0f6bc6464671c01e7ce7ed1b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.077f3bd620de5447e052.js></script></body></html>
--- a/application/admin/view/order_main/edit.html
+++ b/application/admin/view/order_main/edit.html
@@ -4,4 +4,4 @@
    window.id = document.getElementById('c-id').value
    console.log(id)
 </script>
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.698786fe542a37ae30fce78443ce5c30.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.4ea76294a6c0a4c152e8.js></script></body></html>
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.d568dd9d0f6bc6464671c01e7ce7ed1b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.077f3bd620de5447e052.js></script></body></html>
--- a/public/static/css/app.d568dd9d0f6bc6464671c01e7ce7ed1b.css
+++ b/public/static/css/app.d568dd9d0f6bc6464671c01e7ce7ed1b.css
--- a/public/static/js/app.077f3bd620de5447e052.js
+++ b/public/static/js/app.077f3bd620de5447e052.js
--- a/public/static/js/app.4ea76294a6c0a4c152e8.js
+++ b/public/static/js/app.4ea76294a6c0a4c152e8.js