From 1fe3213ef9be7720cef0bd68395fda40441688a2 Mon Sep 17 00:00:00 2001 From: chulaixi Date: Fri, 27 Nov 2020 13:42:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=9C=B0=E5=9D=80=E6=A8=A1=E5=9D=97=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/Order.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index 4d55bc1e5..77f6e23da 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -60,7 +60,7 @@ class Order extends Common 'total' => $total, 'where' => $this->data_request, 'page' => $this->page, - 'url' => MyUrl('admin/order/index'), + 'url' => MyUrl('index/order/index'), ]; $page = new \base\Page($page_params); From d74f10e158c6d5c7b7247d73ea8fafd2b490a080 Mon Sep 17 00:00:00 2001 From: Devil Date: Fri, 27 Nov 2020 14:14:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/Userintegral.php | 2 +- public/nginx.htaccess | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 public/nginx.htaccess diff --git a/application/index/controller/Userintegral.php b/application/index/controller/Userintegral.php index 4a95fb375..621ed5f64 100755 --- a/application/index/controller/Userintegral.php +++ b/application/index/controller/Userintegral.php @@ -58,7 +58,7 @@ class UserIntegral extends Common 'total' => $total, 'where' => $this->data_request, 'page' => $this->page, - 'url' => MyUrl('admin/userintegral/index'), + 'url' => MyUrl('index/userintegral/index'), ]; $page = new \base\Page($page_params); diff --git a/public/nginx.htaccess b/public/nginx.htaccess new file mode 100644 index 000000000..9778694c9 --- /dev/null +++ b/public/nginx.htaccess @@ -0,0 +1,5 @@ +location / { + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?s=/$1 last; + } +} \ No newline at end of file From 0337346f759d459ba86a56cf2f332ffe73e0e3f6 Mon Sep 17 00:00:00 2001 From: Devil Date: Fri, 27 Nov 2020 14:15:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + public/nginx.htaccess | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 public/nginx.htaccess diff --git a/.gitignore b/.gitignore index d64e0577e..b8c5122c2 100755 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ .tea .idea .htaccess +nginx.htaccess *payment_*_respond.php *payment_*_notify.php \ No newline at end of file diff --git a/public/nginx.htaccess b/public/nginx.htaccess deleted file mode 100644 index 9778694c9..000000000 --- a/public/nginx.htaccess +++ /dev/null @@ -1,5 +0,0 @@ -location / { - if (!-e $request_filename) { - rewrite ^(.*)$ /index.php?s=/$1 last; - } -} \ No newline at end of file