应用目录结构优化

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).' 应用控制器未定义');

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).' 应用控制器未定义');

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');
     }
 
     /**

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');
         }
     }
 

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;

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'];
         }

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'];
         }

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'];
         }

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", '<br />', $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'];
         }

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'];
         }

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'];
         }

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;

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'];
         }

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'];
         }

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'];
         }

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'];
         }

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'];
         }

application/plugins/expressforkdn/admin/Admin.php

@@ -1,5 +1,5 @@
 <?php
-namespace app\plugins\expressforkdn;
+namespace app\plugins\expressforkdn\admin;
 
 use think\Controller;
 use app\service\PluginsService;
@@ -22,7 +22,7 @@ class Admin extends Controller
         {
 			$this->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'];
         }

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 '';
     }

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');
     }
 
     /**

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;

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'];
         }

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

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 '';
     }

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');
     }
 
     /**

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;

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;
 
 /**
  * 会员等级插件 - 钩子入口

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'];
         }

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');
     }
 
     /**

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;

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'];
         }

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'];
         }

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'];
         }

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'];
         }

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');

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;

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", '<br />', $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'];
         }

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;

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'];
         }

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'];
         }

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'];
         }

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'];
         }

application/plugins/view/answers/index/index/detail.html

@@ -58,7 +58,7 @@
   <!-- 右侧列表 -->
   <div class="am-u-md-4 answers-sidebar">
     <!-- 操作 -->
-    {{include file="../../../plugins/view/answers/index/operation" /}}
+    {{include file="../../../plugins/view/answers/index/public/operation" /}}
     
     <!-- 右侧推荐问答 -->
     <div data-am-widget="list_news" class="am-list-news am-list-news-default">
@@ -125,7 +125,7 @@
   </div>
 
   <!-- 提问popup -->
-  {{include file="../../../plugins/view/answers/index/popup" /}}
+  {{include file="../../../plugins/view/answers/index/public/popup" /}}
 </div>
 <!-- content end -->
 

application/plugins/view/answers/index/index/index.html

@@ -41,7 +41,7 @@
     <!-- 右侧列表 -->
     <div class="am-u-md-4 answers-sidebar">
       <!-- 操作 -->
-      {{include file="../../../plugins/view/answers/index/operation" /}}
+      {{include file="../../../plugins/view/answers/index/public/operation" /}}
       
       <!-- 右侧推荐问答 -->
       <div data-am-widget="list_news" class="am-list-news am-list-news-default">
@@ -193,7 +193,7 @@
   {{/if}}
 
   <!-- 提问popup -->
-  {{include file="../../../plugins/view/answers/index/popup" /}}
+  {{include file="../../../plugins/view/answers/index/public/popup" /}}
 </div>
 <!-- content end -->
 

application/plugins/view/answers/index/index/search.html

@@ -49,7 +49,7 @@
   <!-- 右侧列表 -->
   <div class="am-u-md-4 answers-sidebar">
     <!-- 操作 -->
-    {{include file="../../../plugins/view/answers/index/operation" /}}
+    {{include file="../../../plugins/view/answers/index/public/operation" /}}
     
     <!-- 右侧推荐问答 -->
     <div data-am-widget="list_news" class="am-list-news am-list-news-default">
@@ -116,7 +116,7 @@
   </div>
 
   <!-- 提问popup -->
-  {{include file="../../../plugins/view/answers/index/popup" /}}
+  {{include file="../../../plugins/view/answers/index/public/popup" /}}
 </div>
 <!-- content end -->
 

application/plugins/view/commononlineservice/admin/admin/saveinfo.html

@@ -46,9 +46,11 @@
 
             <div class="am-form-group">
                 <label>距离顶部<span class="am-form-group-label-tips">默认距离顶部30%</span></label>
-                <div class="am-input-group am-input-radius am-input-group-sm">
+                <div class="am-input-group am-input-group-sm">
                     <input type="number" name="distance_top" placeholder="距离顶部" min="0" max="100" data-validation-message="距离顶部 0~100" class="am-form-field" value="{{if isset($data['distance_top'])}}{{$data.distance_top}}{{else /}}30{{/if}}" required />
-                    <span class="am-input-group-label">%</span>
+                    <span class="am-input-group-btn">
+                        <button type="button" class="am-btn am-btn-default am-radius">%</button>
+                    </span>
                 </div>
             </div>