From 034083462e7361f647ce3a528e25f9e79724178c Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Thu, 9 May 2019 01:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=9B=AE=E5=BD=95=E7=BB=93?=
=?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/Plugins.php | 2 +-
application/index/controller/Plugins.php | 2 +-
.../plugins/answers/{ => admin}/Admin.php | 14 +--
.../plugins/answers/{ => index}/Index.php | 10 +-
.../plugins/answers/{ => service}/Service.php | 2 +-
application/plugins/commongobacktop/Hook.php | 2 +-
.../commongobacktop/{ => admin}/Admin.php | 6 +-
.../plugins/commononlineservice/Hook.php | 2 +-
.../commononlineservice/{ => admin}/Admin.php | 6 +-
.../plugins/commonrightnavigation/Hook.php | 2 +-
.../{ => admin}/Admin.php | 6 +-
.../{ => index}/Index.php | 2 +-
.../plugins/commontopmaxpicture/Hook.php | 2 +-
.../commontopmaxpicture/{ => admin}/Admin.php | 6 +-
application/plugins/commontopnotice/Hook.php | 2 +-
.../commontopnotice/{ => admin}/Admin.php | 6 +-
application/plugins/expressforkdn/Hook.php | 2 +-
.../expressforkdn/{ => admin}/Admin.php | 6 +-
.../plugins/footercustomerservice/Hook.php | 4 +-
.../{ => admin}/Admin.php | 12 +--
.../{ => service}/Service.php | 2 +-
.../plugins/freightfee/{ => admin}/Admin.php | 8 +-
.../freightfee/{ => service}/Service.php | 4 +-
application/plugins/homemiddleadv/Hook.php | 4 +-
.../homemiddleadv/{ => admin}/Admin.php | 12 +--
.../homemiddleadv/{ => service}/Service.php | 2 +-
application/plugins/membershiplevel/Hook.php | 2 +-
.../membershiplevel/{ => admin}/Admin.php | 8 +-
.../membershiplevel/{ => admin}/Level.php | 8 +-
.../membershiplevel/{ => service}/Service.php | 2 +-
.../newuserreduction/{ => admin}/Admin.php | 6 +-
application/plugins/share/Hook.php | 2 +-
.../plugins/share/{ => admin}/Admin.php | 6 +-
.../plugins/touristbuy/{ => admin}/Admin.php | 6 +-
.../plugins/touristbuy/{ => index}/Index.php | 10 +-
.../touristbuy/{ => service}/Service.php | 2 +-
.../plugins/ucenter/{ => admin}/Admin.php | 6 +-
.../plugins/ucenter/{ => index}/Api.php | 2 +-
.../plugins/usercentertopnotice/Hook.php | 2 +-
.../usercentertopnotice/{ => admin}/Admin.php | 6 +-
.../{ => admin}/Admin.php | 6 +-
.../{ => admin}/Admin.php | 6 +-
.../answers/admin/{ => admin}/baseinfo.html | 0
.../answers/admin/{ => admin}/goodsinfo.html | 0
.../view/answers/admin/{ => admin}/index.html | 0
.../answers/admin/{ => admin}/slider.html | 0
.../answers/admin/{ => admin}/sliderinfo.html | 0
.../answers/index/{ => index}/detail.html | 4 +-
.../view/answers/index/{ => index}/index.html | 4 +-
.../answers/index/{ => index}/search.html | 4 +-
.../answers/index/{ => public}/operation.html | 0
.../answers/index/{ => public}/popup.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../index/{ => public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 6 +-
.../index/{ => public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../index/{ => public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../index/{ => public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../index/{ => public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../{admin => index/public}/content.html | 0
.../admin/{ => admin}/dataindex.html | 0
.../admin/{ => admin}/datainfo.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../index/{ => public}/content.html | 0
.../freightfee/admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../admin/{ => admin}/dataindex.html | 0
.../admin/{ => admin}/datainfo.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../index/{ => public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../{ => admin}/level/index.html | 0
.../{ => admin}/level/saveinfo.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../view/share/admin/{ => admin}/index.html | 0
.../share/admin/{ => admin}/saveinfo.html | 0
.../share/index/{ => public}/content.html | 0
.../view/share/index/{ => public}/share.html | 0
.../touristbuy/admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../touristbuy/index/{ => index}/detail.html | 0
.../touristbuy/index/{ => index}/index.html | 0
.../touristbuy/index/{ => index}/success.html | 0
.../view/ucenter/admin/{ => admin}/index.html | 0
.../ucenter/admin/{ => admin}/saveinfo.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../usercentertopnotice/index/content.html | 3 -
.../index/public}/content.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../admin/{ => admin}/index.html | 0
.../admin/{ => admin}/saveinfo.html | 0
.../view/wallet/admin/{ => admin}/index.html | 2 +-
.../wallet/admin/{ => admin}/saveinfo.html | 0
.../{walletadmin => admin/wallet}/index.html | 4 +-
.../wallet}/saveinfo.html | 4 +-
.../wallet/{ => index}/cash/authinfo.html | 2 +-
.../wallet/{ => index}/cash/createinfo.html | 2 +-
.../view/wallet/{ => index}/cash/index.html | 2 +-
.../view/wallet/{ => index}/public/nav.html | 0
.../wallet/{ => index}/recharge/index.html | 2 +-
.../view/wallet/{ => index}/wallet/index.html | 2 +-
.../plugins/view/wallet/level/index.html | 92 -----------------
.../plugins/view/wallet/level/saveinfo.html | 99 -------------------
.../plugins/wallet/{ => admin}/Admin.php | 6 +-
.../{Walletadmin.php => admin/Wallet.php} | 8 +-
.../plugins/wallet/{ => index}/Cash.php | 10 +-
.../plugins/wallet/{ => index}/Common.php | 2 +-
.../plugins/wallet/{ => index}/Recharge.php | 6 +-
.../wallet/{ => index}/Rechargenotify.php | 2 +-
.../plugins/wallet/{ => index}/Wallet.php | 6 +-
application/service/PluginsAdminService.php | 36 ++++---
application/tags.php | 69 ++++++++-----
.../admin/{walletadmin.css => wallet.css} | 0
129 files changed, 215 insertions(+), 370 deletions(-)
rename application/plugins/answers/{ => admin}/Admin.php (97%)
rename application/plugins/answers/{ => index}/Index.php (98%)
rename application/plugins/answers/{ => service}/Service.php (99%)
rename application/plugins/commongobacktop/{ => admin}/Admin.php (96%)
rename application/plugins/commononlineservice/{ => admin}/Admin.php (95%)
rename application/plugins/commonrightnavigation/{ => admin}/Admin.php (95%)
rename application/plugins/commonrightnavigation/{ => index}/Index.php (97%)
rename application/plugins/commontopmaxpicture/{ => admin}/Admin.php (95%)
rename application/plugins/commontopnotice/{ => admin}/Admin.php (95%)
rename application/plugins/expressforkdn/{ => admin}/Admin.php (94%)
rename application/plugins/footercustomerservice/{ => admin}/Admin.php (95%)
rename application/plugins/footercustomerservice/{ => service}/Service.php (99%)
rename application/plugins/freightfee/{ => admin}/Admin.php (96%)
rename application/plugins/freightfee/{ => service}/Service.php (98%)
rename application/plugins/homemiddleadv/{ => admin}/Admin.php (96%)
rename application/plugins/homemiddleadv/{ => service}/Service.php (99%)
rename application/plugins/membershiplevel/{ => admin}/Admin.php (94%)
rename application/plugins/membershiplevel/{ => admin}/Level.php (95%)
rename application/plugins/membershiplevel/{ => service}/Service.php (99%)
rename application/plugins/newuserreduction/{ => admin}/Admin.php (95%)
rename application/plugins/share/{ => admin}/Admin.php (96%)
rename application/plugins/touristbuy/{ => admin}/Admin.php (96%)
rename application/plugins/touristbuy/{ => index}/Index.php (96%)
rename application/plugins/touristbuy/{ => service}/Service.php (98%)
rename application/plugins/ucenter/{ => admin}/Admin.php (97%)
rename application/plugins/ucenter/{ => index}/Api.php (99%)
rename application/plugins/usercentertopnotice/{ => admin}/Admin.php (95%)
rename application/plugins/userloginrewardintegral/{ => admin}/Admin.php (95%)
rename application/plugins/usernotloginhidegoodsprice/{ => admin}/Admin.php (95%)
rename application/plugins/view/answers/admin/{ => admin}/baseinfo.html (100%)
rename application/plugins/view/answers/admin/{ => admin}/goodsinfo.html (100%)
rename application/plugins/view/answers/admin/{ => admin}/index.html (100%)
rename application/plugins/view/answers/admin/{ => admin}/slider.html (100%)
rename application/plugins/view/answers/admin/{ => admin}/sliderinfo.html (100%)
rename application/plugins/view/answers/index/{ => index}/detail.html (96%)
rename application/plugins/view/answers/index/{ => index}/index.html (97%)
rename application/plugins/view/answers/index/{ => index}/search.html (96%)
rename application/plugins/view/answers/index/{ => public}/operation.html (100%)
rename application/plugins/view/answers/index/{ => public}/popup.html (100%)
rename application/plugins/view/commongobacktop/admin/{ => admin}/index.html (100%)
rename application/plugins/view/commongobacktop/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/commongobacktop/index/{ => public}/content.html (100%)
rename application/plugins/view/commononlineservice/admin/{ => admin}/index.html (100%)
rename application/plugins/view/commononlineservice/admin/{ => admin}/saveinfo.html (93%)
rename application/plugins/view/commononlineservice/index/{ => public}/content.html (100%)
rename application/plugins/view/commonrightnavigation/admin/{ => admin}/index.html (100%)
rename application/plugins/view/commonrightnavigation/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/commonrightnavigation/index/{ => public}/content.html (100%)
rename application/plugins/view/commontopmaxpicture/admin/{ => admin}/index.html (100%)
rename application/plugins/view/commontopmaxpicture/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/commontopmaxpicture/index/{ => public}/content.html (100%)
rename application/plugins/view/commontopnotice/admin/{ => admin}/index.html (100%)
rename application/plugins/view/commontopnotice/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/commontopnotice/index/{ => public}/content.html (100%)
rename application/plugins/view/expressforkdn/admin/{ => admin}/index.html (100%)
rename application/plugins/view/expressforkdn/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/expressforkdn/{admin => index/public}/content.html (100%)
rename application/plugins/view/footercustomerservice/admin/{ => admin}/dataindex.html (100%)
rename application/plugins/view/footercustomerservice/admin/{ => admin}/datainfo.html (100%)
rename application/plugins/view/footercustomerservice/admin/{ => admin}/index.html (100%)
rename application/plugins/view/footercustomerservice/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/footercustomerservice/index/{ => public}/content.html (100%)
rename application/plugins/view/freightfee/admin/{ => admin}/index.html (100%)
rename application/plugins/view/freightfee/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/homemiddleadv/admin/{ => admin}/dataindex.html (100%)
rename application/plugins/view/homemiddleadv/admin/{ => admin}/datainfo.html (100%)
rename application/plugins/view/homemiddleadv/admin/{ => admin}/index.html (100%)
rename application/plugins/view/homemiddleadv/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/homemiddleadv/index/{ => public}/content.html (100%)
rename application/plugins/view/membershiplevel/admin/{ => admin}/index.html (100%)
rename application/plugins/view/membershiplevel/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/membershiplevel/{ => admin}/level/index.html (100%)
rename application/plugins/view/membershiplevel/{ => admin}/level/saveinfo.html (100%)
rename application/plugins/view/newuserreduction/admin/{ => admin}/index.html (100%)
rename application/plugins/view/newuserreduction/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/share/admin/{ => admin}/index.html (100%)
rename application/plugins/view/share/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/share/index/{ => public}/content.html (100%)
rename application/plugins/view/share/index/{ => public}/share.html (100%)
rename application/plugins/view/touristbuy/admin/{ => admin}/index.html (100%)
rename application/plugins/view/touristbuy/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/touristbuy/index/{ => index}/detail.html (100%)
rename application/plugins/view/touristbuy/index/{ => index}/index.html (100%)
rename application/plugins/view/touristbuy/index/{ => index}/success.html (100%)
rename application/plugins/view/ucenter/admin/{ => admin}/index.html (100%)
rename application/plugins/view/ucenter/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/usercentertopnotice/admin/{ => admin}/index.html (100%)
rename application/plugins/view/usercentertopnotice/admin/{ => admin}/saveinfo.html (100%)
delete mode 100755 application/plugins/view/usercentertopnotice/index/content.html
rename application/plugins/view/{ucenter/index => usercentertopnotice/index/public}/content.html (100%)
rename application/plugins/view/userloginrewardintegral/admin/{ => admin}/index.html (100%)
rename application/plugins/view/userloginrewardintegral/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/usernotloginhidegoodsprice/admin/{ => admin}/index.html (100%)
rename application/plugins/view/usernotloginhidegoodsprice/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/wallet/admin/{ => admin}/index.html (98%)
rename application/plugins/view/wallet/admin/{ => admin}/saveinfo.html (100%)
rename application/plugins/view/wallet/{walletadmin => admin/wallet}/index.html (97%)
rename application/plugins/view/wallet/{walletadmin => admin/wallet}/saveinfo.html (93%)
rename application/plugins/view/wallet/{ => index}/cash/authinfo.html (98%)
rename application/plugins/view/wallet/{ => index}/cash/createinfo.html (97%)
rename application/plugins/view/wallet/{ => index}/cash/index.html (98%)
rename application/plugins/view/wallet/{ => index}/public/nav.html (100%)
rename application/plugins/view/wallet/{ => index}/recharge/index.html (97%)
rename application/plugins/view/wallet/{ => index}/wallet/index.html (98%)
delete mode 100755 application/plugins/view/wallet/level/index.html
delete mode 100755 application/plugins/view/wallet/level/saveinfo.html
rename application/plugins/wallet/{ => admin}/Admin.php (97%)
rename application/plugins/wallet/{Walletadmin.php => admin/Wallet.php} (94%)
rename application/plugins/wallet/{ => index}/Cash.php (94%)
rename application/plugins/wallet/{ => index}/Common.php (98%)
rename application/plugins/wallet/{ => index}/Recharge.php (97%)
rename application/plugins/wallet/{ => index}/Rechargenotify.php (96%)
rename application/plugins/wallet/{ => index}/Wallet.php (94%)
rename public/static/plugins/css/wallet/admin/{walletadmin.css => wallet.css} (100%)
diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php
index 0c8a1ae75..64d4753bb 100755
--- a/application/admin/controller/Plugins.php
+++ b/application/admin/controller/Plugins.php
@@ -92,7 +92,7 @@ class Plugins extends Common
$this->assign('editor_path_type', 'plugins_'.$pluginsname);
// 应用控制器
- $plugins = '\app\plugins\\'.$pluginsname.'\\'.ucfirst($pluginscontrol);
+ $plugins = '\app\plugins\\'.$pluginsname.'\admin\\'.ucfirst($pluginscontrol);
if(!class_exists($plugins))
{
$this->assign('msg', ucfirst($pluginscontrol).' 应用控制器未定义');
diff --git a/application/index/controller/Plugins.php b/application/index/controller/Plugins.php
index 9f842989e..7979cffdb 100755
--- a/application/index/controller/Plugins.php
+++ b/application/index/controller/Plugins.php
@@ -86,7 +86,7 @@ class Plugins extends Common
$this->assign('editor_path_type', 'plugins_'.$pluginsname);
// 应用控制器
- $plugins = '\app\plugins\\'.$pluginsname.'\\'.ucfirst($pluginscontrol);
+ $plugins = '\app\plugins\\'.$pluginsname.'\index\\'.ucfirst($pluginscontrol);
if(!class_exists($plugins))
{
$this->assign('msg', ucfirst($pluginscontrol).' 应用控制器未定义');
diff --git a/application/plugins/answers/Admin.php b/application/plugins/answers/admin/Admin.php
similarity index 97%
rename from application/plugins/answers/Admin.php
rename to application/plugins/answers/admin/Admin.php
index f5298c523..ea90aa74d 100755
--- a/application/plugins/answers/Admin.php
+++ b/application/plugins/answers/admin/Admin.php
@@ -8,11 +8,11 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\answers;
+namespace app\plugins\answers\admin;
use think\Controller;
use app\service\PluginsService;
-use app\plugins\answers\Service;
+use app\plugins\answers\service\Service;
use app\service\GoodsService;
/**
@@ -49,7 +49,7 @@ class Admin extends Controller
$goods = Service::GoodsList();
$this->assign('goods_list', $goods['data']['goods']);
- return $this->fetch('../../../plugins/view/answers/admin/index');
+ return $this->fetch('../../../plugins/view/answers/admin/admin/index');
}
/**
@@ -83,7 +83,7 @@ class Admin extends Controller
$this->assign('answers_rc_list', []);
}
- return $this->fetch('../../../plugins/view/answers/admin/baseinfo');
+ return $this->fetch('../../../plugins/view/answers/admin/admin/baseinfo');
} else {
return $ret['msg'];
}
@@ -116,7 +116,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data_list', $ret['data']);
- return $this->fetch('../../../plugins/view/answers/admin/slider');
+ return $this->fetch('../../../plugins/view/answers/admin/admin/slider');
} else {
return $ret['msg'];
}
@@ -144,7 +144,7 @@ class Admin extends Controller
}
$this->assign('data', $data);
- return $this->fetch('../../../plugins/view/answers/admin/sliderinfo');
+ return $this->fetch('../../../plugins/view/answers/admin/admin/sliderinfo');
}
/**
@@ -225,7 +225,7 @@ class Admin extends Controller
// 商品分类
$this->assign('goods_category_list', GoodsService::GoodsCategoryAll());
- return $this->fetch('../../../plugins/view/answers/admin/goodsinfo');
+ return $this->fetch('../../../plugins/view/answers/admin/admin/goodsinfo');
}
/**
diff --git a/application/plugins/answers/Index.php b/application/plugins/answers/index/Index.php
similarity index 98%
rename from application/plugins/answers/Index.php
rename to application/plugins/answers/index/Index.php
index ab017b555..584bd5698 100755
--- a/application/plugins/answers/Index.php
+++ b/application/plugins/answers/index/Index.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\answers;
+namespace app\plugins\answers\index;
use think\Controller;
use app\service\PluginsService;
@@ -16,7 +16,7 @@ use app\service\AnswerService;
use app\service\UserService;
use app\service\SeoService;
use app\service\GoodsService;
-use app\plugins\answers\Service;
+use app\plugins\answers\service\Service;
/**
* 问答 - 前端独立页面入口
@@ -78,7 +78,7 @@ class Index extends Controller
$seo_name = empty($base['data']['application_name']) ? '问答' : $base['data']['application_name'];
$this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($seo_name, 1));
- return $this->fetch('../../../plugins/view/answers/index/index');
+ return $this->fetch('../../../plugins/view/answers/index/index/index');
}
/**
@@ -128,7 +128,7 @@ class Index extends Controller
$this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($detail['data']['content']));
}
- return $this->fetch('../../../plugins/view/answers/index/detail');
+ return $this->fetch('../../../plugins/view/answers/index/index/detail');
}
/**
@@ -202,7 +202,7 @@ class Index extends Controller
// 浏览器标题
$this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('问答搜索', 1));
- return $this->fetch('../../../plugins/view/answers/index/search');
+ return $this->fetch('../../../plugins/view/answers/index/index/search');
}
}
diff --git a/application/plugins/answers/Service.php b/application/plugins/answers/service/Service.php
similarity index 99%
rename from application/plugins/answers/Service.php
rename to application/plugins/answers/service/Service.php
index dbe30a5e8..0e27fef68 100755
--- a/application/plugins/answers/Service.php
+++ b/application/plugins/answers/service/Service.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\answers;
+namespace app\plugins\answers\service;
use think\Db;
use app\service\ResourcesService;
diff --git a/application/plugins/commongobacktop/Hook.php b/application/plugins/commongobacktop/Hook.php
index 6ae036a64..b57ab7e8a 100755
--- a/application/plugins/commongobacktop/Hook.php
+++ b/application/plugins/commongobacktop/Hook.php
@@ -139,7 +139,7 @@ class Hook extends Controller
}
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commongobacktop/index/content');
+ return $this->fetch('../../../plugins/view/commongobacktop/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commongobacktop/Admin.php b/application/plugins/commongobacktop/admin/Admin.php
similarity index 96%
rename from application/plugins/commongobacktop/Admin.php
rename to application/plugins/commongobacktop/admin/Admin.php
index e428721f4..f2085a13a 100755
--- a/application/plugins/commongobacktop/Admin.php
+++ b/application/plugins/commongobacktop/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\commongobacktop;
+namespace app\plugins\commongobacktop\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commongobacktop/admin/index');
+ return $this->fetch('../../../plugins/view/commongobacktop/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commongobacktop/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/commongobacktop/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commononlineservice/Hook.php b/application/plugins/commononlineservice/Hook.php
index 66c46bb51..213c8aec3 100755
--- a/application/plugins/commononlineservice/Hook.php
+++ b/application/plugins/commononlineservice/Hook.php
@@ -116,7 +116,7 @@ class Hook extends Controller
$ret['data']['online_service'] = $online_service_data;
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commononlineservice/index/content');
+ return $this->fetch('../../../plugins/view/commononlineservice/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commononlineservice/Admin.php b/application/plugins/commononlineservice/admin/Admin.php
similarity index 95%
rename from application/plugins/commononlineservice/Admin.php
rename to application/plugins/commononlineservice/admin/Admin.php
index f128117e2..2c24b44f9 100755
--- a/application/plugins/commononlineservice/Admin.php
+++ b/application/plugins/commononlineservice/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\commononlineservice;
+namespace app\plugins\commononlineservice\admin;
use think\Controller;
use app\service\PluginsService;
@@ -39,7 +39,7 @@ class Admin extends Controller
$ret['data']['online_service'] = str_replace("\n", '
', $ret['data']['online_service']);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commononlineservice/admin/index');
+ return $this->fetch('../../../plugins/view/commononlineservice/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -66,7 +66,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commononlineservice/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/commononlineservice/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php
index fdb756495..1f4a6dda2 100755
--- a/application/plugins/commonrightnavigation/Hook.php
+++ b/application/plugins/commonrightnavigation/Hook.php
@@ -135,7 +135,7 @@ class Hook extends Controller
];
$this->assign('base', $base);
- return $this->fetch('../../../plugins/view/commonrightnavigation/index/content');
+ return $this->fetch('../../../plugins/view/commonrightnavigation/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commonrightnavigation/Admin.php b/application/plugins/commonrightnavigation/admin/Admin.php
similarity index 95%
rename from application/plugins/commonrightnavigation/Admin.php
rename to application/plugins/commonrightnavigation/admin/Admin.php
index 92132f8bf..94dda34a5 100755
--- a/application/plugins/commonrightnavigation/Admin.php
+++ b/application/plugins/commonrightnavigation/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\commonrightnavigation;
+namespace app\plugins\commonrightnavigation\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commonrightnavigation/admin/index');
+ return $this->fetch('../../../plugins/view/commonrightnavigation/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commonrightnavigation/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/commonrightnavigation/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commonrightnavigation/Index.php b/application/plugins/commonrightnavigation/index/Index.php
similarity index 97%
rename from application/plugins/commonrightnavigation/Index.php
rename to application/plugins/commonrightnavigation/index/Index.php
index 2afcb4416..a9dd27cac 100755
--- a/application/plugins/commonrightnavigation/Index.php
+++ b/application/plugins/commonrightnavigation/index/Index.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\commonrightnavigation;
+namespace app\plugins\commonrightnavigation\index;
use think\Controller;
use app\service\AnswerService;
diff --git a/application/plugins/commontopmaxpicture/Hook.php b/application/plugins/commontopmaxpicture/Hook.php
index f602c2cde..056746ce0 100755
--- a/application/plugins/commontopmaxpicture/Hook.php
+++ b/application/plugins/commontopmaxpicture/Hook.php
@@ -96,7 +96,7 @@ class Hook extends Controller
}
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commontopmaxpicture/index/content');
+ return $this->fetch('../../../plugins/view/commontopmaxpicture/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commontopmaxpicture/Admin.php b/application/plugins/commontopmaxpicture/admin/Admin.php
similarity index 95%
rename from application/plugins/commontopmaxpicture/Admin.php
rename to application/plugins/commontopmaxpicture/admin/Admin.php
index 59446be6e..5bff1a1e7 100755
--- a/application/plugins/commontopmaxpicture/Admin.php
+++ b/application/plugins/commontopmaxpicture/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\commontopmaxpicture;
+namespace app\plugins\commontopmaxpicture\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commontopmaxpicture/admin/index');
+ return $this->fetch('../../../plugins/view/commontopmaxpicture/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commontopmaxpicture/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/commontopmaxpicture/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commontopnotice/Hook.php b/application/plugins/commontopnotice/Hook.php
index 6a9a3bec4..89742b395 100755
--- a/application/plugins/commontopnotice/Hook.php
+++ b/application/plugins/commontopnotice/Hook.php
@@ -97,7 +97,7 @@ class Hook extends Controller
}
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commontopnotice/index/content');
+ return $this->fetch('../../../plugins/view/commontopnotice/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/commontopnotice/Admin.php b/application/plugins/commontopnotice/admin/Admin.php
similarity index 95%
rename from application/plugins/commontopnotice/Admin.php
rename to application/plugins/commontopnotice/admin/Admin.php
index 12ee08063..ac63db5b2 100755
--- a/application/plugins/commontopnotice/Admin.php
+++ b/application/plugins/commontopnotice/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\commontopnotice;
+namespace app\plugins\commontopnotice\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commontopnotice/admin/index');
+ return $this->fetch('../../../plugins/view/commontopnotice/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/commontopnotice/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/commontopnotice/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/expressforkdn/Hook.php b/application/plugins/expressforkdn/Hook.php
index 6deebf954..e0b266ddb 100755
--- a/application/plugins/expressforkdn/Hook.php
+++ b/application/plugins/expressforkdn/Hook.php
@@ -120,7 +120,7 @@ class Hook extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/expressforkdn/admin/content');
+ return $this->fetch('../../../plugins/view/expressforkdn/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/expressforkdn/Admin.php b/application/plugins/expressforkdn/admin/Admin.php
similarity index 94%
rename from application/plugins/expressforkdn/Admin.php
rename to application/plugins/expressforkdn/admin/Admin.php
index 13791d3bd..8d94d6c9d 100755
--- a/application/plugins/expressforkdn/Admin.php
+++ b/application/plugins/expressforkdn/admin/Admin.php
@@ -1,5 +1,5 @@
assign('express_list', ExpressService::ExpressList());
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/expressforkdn/admin/index');
+ return $this->fetch('../../../plugins/view/expressforkdn/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -43,7 +43,7 @@ class Admin extends Controller
{
$this->assign('express_list', ExpressService::ExpressList());
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/expressforkdn/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/expressforkdn/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/footercustomerservice/Hook.php b/application/plugins/footercustomerservice/Hook.php
index 440680860..4d8151136 100755
--- a/application/plugins/footercustomerservice/Hook.php
+++ b/application/plugins/footercustomerservice/Hook.php
@@ -11,7 +11,7 @@
namespace app\plugins\footercustomerservice;
use think\Controller;
-use app\plugins\footercustomerservice\Service;
+use app\plugins\footercustomerservice\service\Service;
use app\service\PluginsService;
/**
@@ -67,7 +67,7 @@ class Hook extends Controller
if($ret['code'] == 0)
{
$this->assign('data_list', $ret['data']);
- return $this->fetch('../../../plugins/view/footercustomerservice/index/content');
+ return $this->fetch('../../../plugins/view/footercustomerservice/index/public/content');
}
return '';
}
diff --git a/application/plugins/footercustomerservice/Admin.php b/application/plugins/footercustomerservice/admin/Admin.php
similarity index 95%
rename from application/plugins/footercustomerservice/Admin.php
rename to application/plugins/footercustomerservice/admin/Admin.php
index 568a990b9..017888abf 100755
--- a/application/plugins/footercustomerservice/Admin.php
+++ b/application/plugins/footercustomerservice/admin/Admin.php
@@ -8,10 +8,10 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\footercustomerservice;
+namespace app\plugins\footercustomerservice\admin;
use think\Controller;
-use app\plugins\footercustomerservice\Service;
+use app\plugins\footercustomerservice\service\Service;
use app\service\PluginsService;
/**
@@ -41,7 +41,7 @@ class Admin extends Controller
$this->assign('data_list', $list['data']);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/footercustomerservice/admin/index');
+ return $this->fetch('../../../plugins/view/footercustomerservice/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -68,7 +68,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/footercustomerservice/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/footercustomerservice/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
@@ -105,7 +105,7 @@ class Admin extends Controller
if($list['code'] == 0)
{
$this->assign('data_list', $list['data']);
- return $this->fetch('../../../plugins/view/footercustomerservice/admin/dataindex');
+ return $this->fetch('../../../plugins/view/footercustomerservice/admin/admin/dataindex');
} else {
return $list['msg'];
}
@@ -133,7 +133,7 @@ class Admin extends Controller
}
$this->assign('data', $data);
- return $this->fetch('../../../plugins/view/footercustomerservice/admin/datainfo');
+ return $this->fetch('../../../plugins/view/footercustomerservice/admin/admin/datainfo');
}
/**
diff --git a/application/plugins/footercustomerservice/Service.php b/application/plugins/footercustomerservice/service/Service.php
similarity index 99%
rename from application/plugins/footercustomerservice/Service.php
rename to application/plugins/footercustomerservice/service/Service.php
index fbad68e8b..d98c784ac 100755
--- a/application/plugins/footercustomerservice/Service.php
+++ b/application/plugins/footercustomerservice/service/Service.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\footercustomerservice;
+namespace app\plugins\footercustomerservice\service;
use app\service\PluginsService;
use app\service\ResourcesService;
diff --git a/application/plugins/freightfee/Admin.php b/application/plugins/freightfee/admin/Admin.php
similarity index 96%
rename from application/plugins/freightfee/Admin.php
rename to application/plugins/freightfee/admin/Admin.php
index f0453bc26..2486b515f 100755
--- a/application/plugins/freightfee/Admin.php
+++ b/application/plugins/freightfee/admin/Admin.php
@@ -8,11 +8,11 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\freightfee;
+namespace app\plugins\freightfee\admin;
use think\Db;
use think\Controller;
-use app\plugins\freightfee\Service;
+use app\plugins\freightfee\service\Service;
use app\service\PluginsService;
use app\service\RegionService;
use app\service\PaymentService;
@@ -41,7 +41,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', Service::DataHandle($ret['data']));
- return $this->fetch('../../../plugins/view/freightfee/admin/index');
+ return $this->fetch('../../../plugins/view/freightfee/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -86,7 +86,7 @@ class Admin extends Controller
$this->assign('region_list', $region);
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', Service::DataHandle($ret['data']));
- return $this->fetch('../../../plugins/view/freightfee/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/freightfee/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/freightfee/Service.php b/application/plugins/freightfee/service/Service.php
similarity index 98%
rename from application/plugins/freightfee/Service.php
rename to application/plugins/freightfee/service/Service.php
index ec71d5e70..7191003e6 100644
--- a/application/plugins/freightfee/Service.php
+++ b/application/plugins/freightfee/service/Service.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\freightfee;
+namespace app\plugins\freightfee\service;
use think\Db;
use app\service\ResourcesService;
@@ -16,7 +16,7 @@ use app\service\GoodsService;
use app\service\AnswerService;
/**
- * 问答系统服务层
+ * 运费设置服务层
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
diff --git a/application/plugins/homemiddleadv/Hook.php b/application/plugins/homemiddleadv/Hook.php
index bd5af8568..7dc9b1043 100755
--- a/application/plugins/homemiddleadv/Hook.php
+++ b/application/plugins/homemiddleadv/Hook.php
@@ -11,7 +11,7 @@
namespace app\plugins\homemiddleadv;
use think\Controller;
-use app\plugins\homemiddleadv\Service;
+use app\plugins\homemiddleadv\service\Service;
use app\service\PluginsService;
/**
@@ -91,7 +91,7 @@ class Hook extends Controller
if($ret['code'] == 0 && !empty($ret['data']))
{
$this->assign('data_list', $ret['data']);
- return $this->fetch('../../../plugins/view/homemiddleadv/index/content');
+ return $this->fetch('../../../plugins/view/homemiddleadv/index/public/content');
}
return '';
}
diff --git a/application/plugins/homemiddleadv/Admin.php b/application/plugins/homemiddleadv/admin/Admin.php
similarity index 96%
rename from application/plugins/homemiddleadv/Admin.php
rename to application/plugins/homemiddleadv/admin/Admin.php
index 29c3b4f70..7a15aab7b 100755
--- a/application/plugins/homemiddleadv/Admin.php
+++ b/application/plugins/homemiddleadv/admin/Admin.php
@@ -8,10 +8,10 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\homemiddleadv;
+namespace app\plugins\homemiddleadv\admin;
use think\Controller;
-use app\plugins\homemiddleadv\Service;
+use app\plugins\homemiddleadv\service\Service;
use app\service\PluginsService;
/**
@@ -41,7 +41,7 @@ class Admin extends Controller
$this->assign('data_list', $list['data']);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/homemiddleadv/admin/index');
+ return $this->fetch('../../../plugins/view/homemiddleadv/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -61,7 +61,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/homemiddleadv/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/homemiddleadv/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
@@ -98,7 +98,7 @@ class Admin extends Controller
if($list['code'] == 0)
{
$this->assign('data_list', $list['data']);
- return $this->fetch('../../../plugins/view/homemiddleadv/admin/dataindex');
+ return $this->fetch('../../../plugins/view/homemiddleadv/admin/admin/dataindex');
} else {
return $list['msg'];
}
@@ -126,7 +126,7 @@ class Admin extends Controller
}
$this->assign('data', $data);
- return $this->fetch('../../../plugins/view/homemiddleadv/admin/datainfo');
+ return $this->fetch('../../../plugins/view/homemiddleadv/admin/admin/datainfo');
}
/**
diff --git a/application/plugins/homemiddleadv/Service.php b/application/plugins/homemiddleadv/service/Service.php
similarity index 99%
rename from application/plugins/homemiddleadv/Service.php
rename to application/plugins/homemiddleadv/service/Service.php
index ba992bb17..c9b60e609 100755
--- a/application/plugins/homemiddleadv/Service.php
+++ b/application/plugins/homemiddleadv/service/Service.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\homemiddleadv;
+namespace app\plugins\homemiddleadv\service;
use app\service\PluginsService;
use app\service\ResourcesService;
diff --git a/application/plugins/membershiplevel/Hook.php b/application/plugins/membershiplevel/Hook.php
index e71ac90bd..c249d859d 100755
--- a/application/plugins/membershiplevel/Hook.php
+++ b/application/plugins/membershiplevel/Hook.php
@@ -11,7 +11,7 @@
namespace app\plugins\membershiplevel;
use think\Controller;
-use app\plugins\membershiplevel\Service;
+use app\plugins\membershiplevel\service\Service;
/**
* 会员等级插件 - 钩子入口
diff --git a/application/plugins/membershiplevel/Admin.php b/application/plugins/membershiplevel/admin/Admin.php
similarity index 94%
rename from application/plugins/membershiplevel/Admin.php
rename to application/plugins/membershiplevel/admin/Admin.php
index df6f949f2..2b5f4b985 100755
--- a/application/plugins/membershiplevel/Admin.php
+++ b/application/plugins/membershiplevel/admin/Admin.php
@@ -8,10 +8,10 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\membershiplevel;
+namespace app\plugins\membershiplevel\admin;
use think\Controller;
-use app\plugins\membershiplevel\Service;
+use app\plugins\membershiplevel\service\Service;
use app\service\PluginsService;
/**
@@ -40,7 +40,7 @@ class Admin extends Controller
$this->assign('members_level_rules_list', Service::$members_level_rules_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/membershiplevel/admin/index');
+ return $this->fetch('../../../plugins/view/membershiplevel/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('members_level_rules_list', Service::$members_level_rules_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/membershiplevel/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/membershiplevel/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/membershiplevel/Level.php b/application/plugins/membershiplevel/admin/Level.php
similarity index 95%
rename from application/plugins/membershiplevel/Level.php
rename to application/plugins/membershiplevel/admin/Level.php
index 1eeff5e20..f8c9316d6 100644
--- a/application/plugins/membershiplevel/Level.php
+++ b/application/plugins/membershiplevel/admin/Level.php
@@ -8,10 +8,10 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\membershiplevel;
+namespace app\plugins\membershiplevel\admin;
use think\Controller;
-use app\plugins\membershiplevel\Service;
+use app\plugins\membershiplevel\service\Service;
use app\service\PluginsService;
/**
@@ -39,7 +39,7 @@ class Level extends Controller
{
$this->assign('data_list', $ret['data']);
$this->assign('params', $params);
- return $this->fetch('../../../plugins/view/membershiplevel/level/index');
+ return $this->fetch('../../../plugins/view/membershiplevel/admin/level/index');
} else {
return $ret['msg'];
}
@@ -67,7 +67,7 @@ class Level extends Controller
}
$this->assign('data', $data);
- return $this->fetch('../../../plugins/view/membershiplevel/level/saveinfo');
+ return $this->fetch('../../../plugins/view/membershiplevel/admin/level/saveinfo');
}
/**
diff --git a/application/plugins/membershiplevel/Service.php b/application/plugins/membershiplevel/service/Service.php
similarity index 99%
rename from application/plugins/membershiplevel/Service.php
rename to application/plugins/membershiplevel/service/Service.php
index df937ac7c..cbd4bb4b9 100755
--- a/application/plugins/membershiplevel/Service.php
+++ b/application/plugins/membershiplevel/service/Service.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\membershiplevel;
+namespace app\plugins\membershiplevel\service;
use think\Db;
use app\service\PluginsService;
diff --git a/application/plugins/newuserreduction/Admin.php b/application/plugins/newuserreduction/admin/Admin.php
similarity index 95%
rename from application/plugins/newuserreduction/Admin.php
rename to application/plugins/newuserreduction/admin/Admin.php
index 53e0a1fbe..5c7e30fa4 100755
--- a/application/plugins/newuserreduction/Admin.php
+++ b/application/plugins/newuserreduction/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\newuserreduction;
+namespace app\plugins\newuserreduction\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/newuserreduction/admin/index');
+ return $this->fetch('../../../plugins/view/newuserreduction/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/newuserreduction/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/newuserreduction/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/share/Hook.php b/application/plugins/share/Hook.php
index 4a205d9af..7c1c0e0bb 100755
--- a/application/plugins/share/Hook.php
+++ b/application/plugins/share/Hook.php
@@ -99,7 +99,7 @@ class Hook extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/share/index/content');
+ return $this->fetch('../../../plugins/view/share/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/share/Admin.php b/application/plugins/share/admin/Admin.php
similarity index 96%
rename from application/plugins/share/Admin.php
rename to application/plugins/share/admin/Admin.php
index 0177341d3..be67a5427 100755
--- a/application/plugins/share/Admin.php
+++ b/application/plugins/share/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\share;
+namespace app\plugins\share\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/share/admin/index');
+ return $this->fetch('../../../plugins/view/share/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -56,7 +56,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/share/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/share/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/touristbuy/Admin.php b/application/plugins/touristbuy/admin/Admin.php
similarity index 96%
rename from application/plugins/touristbuy/Admin.php
rename to application/plugins/touristbuy/admin/Admin.php
index 240237ca5..05335b906 100755
--- a/application/plugins/touristbuy/Admin.php
+++ b/application/plugins/touristbuy/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\touristbuy;
+namespace app\plugins\touristbuy\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/touristbuy/admin/index');
+ return $this->fetch('../../../plugins/view/touristbuy/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/touristbuy/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/touristbuy/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/touristbuy/Index.php b/application/plugins/touristbuy/index/Index.php
similarity index 96%
rename from application/plugins/touristbuy/Index.php
rename to application/plugins/touristbuy/index/Index.php
index 015ceb6a6..ed7eb6a34 100755
--- a/application/plugins/touristbuy/Index.php
+++ b/application/plugins/touristbuy/index/Index.php
@@ -8,10 +8,10 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\touristbuy;
+namespace app\plugins\touristbuy\index;
use think\Controller;
-use app\plugins\touristbuy\Service;
+use app\plugins\touristbuy\service\Service;
use app\service\SeoService;
use app\service\OrderService;
use app\service\PluginsService;
@@ -40,7 +40,7 @@ class Index extends Controller
{
$this->assign('data', $ret['data']);
$this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('订单查询', 1));
- return $this->fetch('../../../plugins/view/touristbuy/index/index');
+ return $this->fetch('../../../plugins/view/touristbuy/index/index/index');
} else {
return $ret['msg'];
}
@@ -104,7 +104,7 @@ class Index extends Controller
// 参数
$this->assign('params', $params);
- return $this->fetch('../../../plugins/view/touristbuy/index/detail');
+ return $this->fetch('../../../plugins/view/touristbuy/index/index/detail');
} else {
$this->assign('msg', '没有相关数据');
return $this->fetch('public/tips_error');
@@ -127,7 +127,7 @@ class Index extends Controller
$this->assign('msg', $ret['msg']);
$this->assign('data', $ret['data']);
$this->assign('is_parent', isset($params['is_parent']) ? $params['is_parent'] : 0);
- return $this->fetch('../../../plugins/view/touristbuy/index/success');
+ return $this->fetch('../../../plugins/view/touristbuy/index/index/success');
} else {
$this->assign('msg', $ret['msg']);
return $this->fetch('public/error');
diff --git a/application/plugins/touristbuy/Service.php b/application/plugins/touristbuy/service/Service.php
similarity index 98%
rename from application/plugins/touristbuy/Service.php
rename to application/plugins/touristbuy/service/Service.php
index 26f05475a..97c2e7b43 100755
--- a/application/plugins/touristbuy/Service.php
+++ b/application/plugins/touristbuy/service/Service.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\touristbuy;
+namespace app\plugins\touristbuy\service;
use think\Db;
use app\service\UserService;
diff --git a/application/plugins/ucenter/Admin.php b/application/plugins/ucenter/admin/Admin.php
similarity index 97%
rename from application/plugins/ucenter/Admin.php
rename to application/plugins/ucenter/admin/Admin.php
index 762c459f8..5bd93e774 100755
--- a/application/plugins/ucenter/Admin.php
+++ b/application/plugins/ucenter/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\ucenter;
+namespace app\plugins\ucenter\admin;
use think\Controller;
use app\service\PluginsService;
@@ -45,7 +45,7 @@ class Admin extends Controller
$ret['data']['accounts_async_url'] = empty($ret['data']['accounts_async_url']) ? '' : str_replace("\n", '
', $ret['data']['accounts_async_url']);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/ucenter/admin/index');
+ return $this->fetch('../../../plugins/view/ucenter/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -72,7 +72,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/ucenter/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/ucenter/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/ucenter/Api.php b/application/plugins/ucenter/index/Api.php
similarity index 99%
rename from application/plugins/ucenter/Api.php
rename to application/plugins/ucenter/index/Api.php
index 83019549e..c0095d7e6 100755
--- a/application/plugins/ucenter/Api.php
+++ b/application/plugins/ucenter/index/Api.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\ucenter;
+namespace app\plugins\ucenter\index;
use think\Db;
use app\service\UserService;
diff --git a/application/plugins/usercentertopnotice/Hook.php b/application/plugins/usercentertopnotice/Hook.php
index 535a9f3a6..f7da6a85f 100755
--- a/application/plugins/usercentertopnotice/Hook.php
+++ b/application/plugins/usercentertopnotice/Hook.php
@@ -82,7 +82,7 @@ class Hook extends Controller
}
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/usercentertopnotice/index/content');
+ return $this->fetch('../../../plugins/view/usercentertopnotice/index/public/content');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/usercentertopnotice/Admin.php b/application/plugins/usercentertopnotice/admin/Admin.php
similarity index 95%
rename from application/plugins/usercentertopnotice/Admin.php
rename to application/plugins/usercentertopnotice/admin/Admin.php
index d8d1a62e0..7882f0e53 100755
--- a/application/plugins/usercentertopnotice/Admin.php
+++ b/application/plugins/usercentertopnotice/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\usercentertopnotice;
+namespace app\plugins\usercentertopnotice\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/usercentertopnotice/admin/index');
+ return $this->fetch('../../../plugins/view/usercentertopnotice/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -56,7 +56,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/usercentertopnotice/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/usercentertopnotice/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/userloginrewardintegral/Admin.php b/application/plugins/userloginrewardintegral/admin/Admin.php
similarity index 95%
rename from application/plugins/userloginrewardintegral/Admin.php
rename to application/plugins/userloginrewardintegral/admin/Admin.php
index ef0ce017e..48514b8e2 100755
--- a/application/plugins/userloginrewardintegral/Admin.php
+++ b/application/plugins/userloginrewardintegral/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\userloginrewardintegral;
+namespace app\plugins\userloginrewardintegral\admin;
use think\Controller;
use app\service\PluginsService;
@@ -36,7 +36,7 @@ class Admin extends Controller
if($ret['code'] == 0)
{
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/userloginrewardintegral/admin/index');
+ return $this->fetch('../../../plugins/view/userloginrewardintegral/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -63,7 +63,7 @@ class Admin extends Controller
$this->assign('is_whether_list', $is_whether_list);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/userloginrewardintegral/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/userloginrewardintegral/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/usernotloginhidegoodsprice/Admin.php b/application/plugins/usernotloginhidegoodsprice/admin/Admin.php
similarity index 95%
rename from application/plugins/usernotloginhidegoodsprice/Admin.php
rename to application/plugins/usernotloginhidegoodsprice/admin/Admin.php
index 04490d04c..5debe3db7 100755
--- a/application/plugins/usernotloginhidegoodsprice/Admin.php
+++ b/application/plugins/usernotloginhidegoodsprice/admin/Admin.php
@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\usernotloginhidegoodsprice;
+namespace app\plugins\usernotloginhidegoodsprice\admin;
use think\Controller;
use app\service\PluginsService;
@@ -51,7 +51,7 @@ class Admin extends Controller
$ret['data']['limit_terminal_text'] = implode(',', $limit_terminal_all);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/index');
+ return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/admin/index');
} else {
return $ret['msg'];
}
@@ -74,7 +74,7 @@ class Admin extends Controller
$ret['data']['limit_terminal'] = empty($ret['data']['limit_terminal']) ? [] : explode(',', $ret['data']['limit_terminal']);
$this->assign('data', $ret['data']);
- return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/saveinfo');
+ return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/admin/saveinfo');
} else {
return $ret['msg'];
}
diff --git a/application/plugins/view/answers/admin/baseinfo.html b/application/plugins/view/answers/admin/admin/baseinfo.html
similarity index 100%
rename from application/plugins/view/answers/admin/baseinfo.html
rename to application/plugins/view/answers/admin/admin/baseinfo.html
diff --git a/application/plugins/view/answers/admin/goodsinfo.html b/application/plugins/view/answers/admin/admin/goodsinfo.html
similarity index 100%
rename from application/plugins/view/answers/admin/goodsinfo.html
rename to application/plugins/view/answers/admin/admin/goodsinfo.html
diff --git a/application/plugins/view/answers/admin/index.html b/application/plugins/view/answers/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/answers/admin/index.html
rename to application/plugins/view/answers/admin/admin/index.html
diff --git a/application/plugins/view/answers/admin/slider.html b/application/plugins/view/answers/admin/admin/slider.html
similarity index 100%
rename from application/plugins/view/answers/admin/slider.html
rename to application/plugins/view/answers/admin/admin/slider.html
diff --git a/application/plugins/view/answers/admin/sliderinfo.html b/application/plugins/view/answers/admin/admin/sliderinfo.html
similarity index 100%
rename from application/plugins/view/answers/admin/sliderinfo.html
rename to application/plugins/view/answers/admin/admin/sliderinfo.html
diff --git a/application/plugins/view/answers/index/detail.html b/application/plugins/view/answers/index/index/detail.html
similarity index 96%
rename from application/plugins/view/answers/index/detail.html
rename to application/plugins/view/answers/index/index/detail.html
index e13513e2e..ff1d3a18e 100755
--- a/application/plugins/view/answers/index/detail.html
+++ b/application/plugins/view/answers/index/index/detail.html
@@ -58,7 +58,7 @@