diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/application/admin/config/app.php b/application/admin/config/app.php old mode 100644 new mode 100755 diff --git a/application/admin/config/template.php b/application/admin/config/template.php old mode 100644 new mode 100755 diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index 641cacb0ae81e237bde971682a74102cec65d198..de1eb2b2d677219997f16a14489e4b9e64ab3b9a 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -56,7 +56,7 @@ class Admin extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/admin/index'), + 'url' => MyUrl('admin/admin/index'), ); $page = new \base\Page($page_params); @@ -118,7 +118,7 @@ class Admin extends Common $data = AdminService::AdminList($data_params); if(empty($data[0])) { - return $this->error('管理员信息不存在', url('admin/index/index')); + return $this->error('管理员信息不存在', MyUrl('admin/index/index')); } $this->assign('data', $data[0]); } @@ -200,7 +200,7 @@ class Admin extends Common // 是否已登录 if(session('admin') !== null) { - return redirect(url('admin/index/index')); + return redirect(MyUrl('admin/index/index')); } return $this->fetch(); @@ -237,7 +237,7 @@ class Admin extends Common public function Logout() { session_destroy(); - return redirect(url('admin/admin/logininfo')); + return redirect(MyUrl('admin/admin/logininfo')); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Answer.php b/application/admin/controller/Answer.php index 72bfe702d290635c0655f271e5d1a7789ef18c06..0dd8ae3123983113bbbd09702f15df8a4abfebe2 100755 --- a/application/admin/controller/Answer.php +++ b/application/admin/controller/Answer.php @@ -58,7 +58,7 @@ class Answer extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/order/index'), + 'url' => MyUrl('admin/order/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Apphomenav.php b/application/admin/controller/Apphomenav.php index c8d98c80c1061777c10f786f8937c2c9a926679b..980cadac565811188357e9c41d286e0e42cba2ee 100755 --- a/application/admin/controller/Apphomenav.php +++ b/application/admin/controller/Apphomenav.php @@ -58,7 +58,7 @@ class AppHomeNav extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/apphomenav/index'), + 'url' => MyUrl('admin/apphomenav/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index 8883de087cb81d5cfc436b643a6ce302e3a3ed7e..e39f78a768f5bf43602ad19ef231eae90ef30f30 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -58,7 +58,7 @@ class Article extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/article/index'), + 'url' => MyUrl('admin/article/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index cd36786e47acad61fd6981a62b8e608bde2bfd87..4c0310539d8cbc10d4412aebee43a8ab431f85f7 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -58,7 +58,7 @@ class Brand extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/brand/index'), + 'url' => MyUrl('admin/brand/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index a1b6a41a3be409318b1aee499ef2ecda38921849..1b09478e8556d0a4476cb56c48db6ee785f98666 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -84,7 +84,7 @@ class Common extends Controller { exit(json_encode(DataReturn('登录失效,请重新登录', -400))); } else { - die(''); + die(''); } } } diff --git a/application/admin/controller/Coupon.php b/application/admin/controller/Coupon.php index cb20fc3c94b2c8a8cf5f1e0daec6b7f0eaaa0206..abbf9c02908d49fe561f624d8aa2123fa669a301 100755 --- a/application/admin/controller/Coupon.php +++ b/application/admin/controller/Coupon.php @@ -54,7 +54,7 @@ class Coupon extends Common 'number' => $number, 'total' => $m->where($where)->count(), 'where' => $param, - 'url' => url('Admin/Coupon/Index'), + 'url' => MyUrl('Admin/Coupon/Index'), ); $page = new \base\Page($page_param); @@ -485,7 +485,7 @@ class Coupon extends Common 'number' => $number, 'total' => $m->alias('uc')->join('__USER__ AS u ON u.id=uc.user_id')->where($where)->count(), 'where' => $param, - 'url' => url('Admin/Coupon/User'), + 'url' => MyUrl('Admin/Coupon/User'), ); $page = new \base\Page($page_param); diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index 9e608e868d01f42cdc405bd298f6a7996ce351f4..7f1e6d606e738e9b6fcad474f278cc6aabd7c296 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -58,7 +58,7 @@ class CustomView extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/customview/index'), + 'url' => MyUrl('admin/customview/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index f38371478d6271bde87d498dc3d055fdc00611ef..a9e2634e585d8453cc8eee8ae0d160bd3e5e5eb5 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -59,7 +59,7 @@ class Goods extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/goods/index'), + 'url' => MyUrl('admin/goods/index'), ); $page = new \base\Page($page_params); @@ -110,7 +110,7 @@ class Goods extends Common $data = GoodsService::GoodsList($data_params); if(empty($data[0])) { - return $this->error('商品信息不存在', url('admin/goods/index')); + return $this->error('商品信息不存在', MyUrl('admin/goods/index')); } $this->assign('data', $data[0]); diff --git a/application/admin/controller/Integrallog.php b/application/admin/controller/Integrallog.php index d9c616159b37d91892c031a59f280ce7cd9a9d2f..3cc181b45629c48fa55c43a2d15e7fec7597ad0d 100755 --- a/application/admin/controller/Integrallog.php +++ b/application/admin/controller/Integrallog.php @@ -60,7 +60,7 @@ class IntegralLog extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/integrallog/index'), + 'url' => MyUrl('admin/integrallog/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Message.php b/application/admin/controller/Message.php index b99ce004d1d969eaeccd4a660742b64fb6727fa0..32d3f9a12215b64cb9b14024276a9b9f49f32b50 100755 --- a/application/admin/controller/Message.php +++ b/application/admin/controller/Message.php @@ -60,7 +60,7 @@ class Message extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/message/index'), + 'url' => MyUrl('admin/message/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 6e85b287d3800dfd6b5c7b9a42e74fa0f4200455..3ccc0bbf3d82cad45015d8abac3c16f9717f4bb2 100755 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -62,7 +62,7 @@ class Order extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/order/index'), + 'url' => MyUrl('admin/order/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Paylog.php b/application/admin/controller/Paylog.php index 142c7a9b876677948cbdbab77793b0dc93771b80..41452f087232df75e14f19df4be947adf1ca8d63 100755 --- a/application/admin/controller/Paylog.php +++ b/application/admin/controller/Paylog.php @@ -60,7 +60,7 @@ class PayLog extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/paylog/index'), + 'url' => MyUrl('admin/paylog/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/Payment.php b/application/admin/controller/Payment.php index 625747581b88a89a6ea4427467371d1ee10235a0..38020184197347534c9f415b6797eb5f9334b62b 100755 --- a/application/admin/controller/Payment.php +++ b/application/admin/controller/Payment.php @@ -75,7 +75,7 @@ class Payment extends Common $data = PaymentService::PaymentList($data_params); if(empty($data[0])) { - return $this->error('没有相关支付方式', url('admin/payment/index')); + return $this->error('没有相关支付方式', MyUrl('admin/payment/index')); } $this->assign('data', $data[0]); } diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index 37e05da4281de98a7a65924617427b07eba68b76..9a45147cd758123af7bc394801ccf1fccb206399 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -58,7 +58,7 @@ class Slide extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/customview/index'), + 'url' => MyUrl('admin/customview/index'), ); $page = new \base\Page($page_params); $this->assign('page_html', $page->GetPageHtml()); diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index dcd6b0d2428991073d75a81d3a1c88c49a9443f8..28faaa6b6d15ab7965c68a5fd5db8f3af5c2112b 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -57,7 +57,7 @@ class User extends Common 'total' => $total, 'where' => $params, 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => url('admin/user/index'), + 'url' => MyUrl('admin/user/index'), ); $page = new \base\Page($page_params); @@ -73,7 +73,7 @@ class User extends Common $this->assign('common_gender_list', lang('common_gender_list')); // Excel地址 - $this->assign('excel_url', url('admin/user/excelexport', $params)); + $this->assign('excel_url', MyUrl('admin/user/excelexport', $params)); $this->assign('params', $params); $this->assign('page_html', $page->GetPageHtml()); @@ -129,7 +129,7 @@ class User extends Common $data = UserService::UserList($data_params); if(empty($data[0])) { - return $this->error('用户信息不存在', url('admin/user/index')); + return $this->error('用户信息不存在', MyUrl('admin/user/index')); } $data[0]['birthday_text'] = empty($data[0]['birthday']) ? '' : date('Y-m-d', $data[0]['birthday']); $this->assign('data', $data[0]); diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php old mode 100644 new mode 100755 index 66b4b6335cc8b4d275b34cc7a22fce5f63ec7542..00ea5063392457873c6d98befd121b13f397e3a0 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -72,25 +72,25 @@ return array( array( 'is_enable' => 1, 'name' => '站点缓存', - 'url' => url('admin/cache/statusupdate'), + 'url' => MyUrl('admin/cache/statusupdate'), 'desc' => '数据转换后或前台不能正常访问时,可以使用此功能更新所有缓存' ), array( 'is_enable' => 1, 'name' => '模板缓存', - 'url' => url('admin/cache/templateupdate'), + 'url' => MyUrl('admin/cache/templateupdate'), 'desc' => '当页面显示不正常,可尝试使用此功能修复' ), array( 'is_enable' => 0, 'name' => '模块缓存', - 'url' => url('admin/cache/moduleupdate'), + 'url' => MyUrl('admin/cache/moduleupdate'), 'desc' => '更新页面布局与模块后未生效,可尝试使用此功能修复' ), array( 'is_enable' => 1, 'name' => '日志清除', - 'url' => url('admin/cache/logdelete'), + 'url' => MyUrl('admin/cache/logdelete'), 'desc' => '清除站点日志' ), ), diff --git a/application/admin/view/default/admin/index.html b/application/admin/view/default/admin/index.html index 61e5118e63a6597526ef6fabf58adab7e9bfe9cc..464e62b0710933627e23d58e7da282aa925e1602 100755 --- a/application/admin/view/default/admin/index.html +++ b/application/admin/view/default/admin/index.html @@ -4,7 +4,7 @@