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", '<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'];
         }
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 @@
 <?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'];
         }
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", '<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'];
         }
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 @@
   <!-- 右侧列表 -->
   <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 -->
 
diff --git a/application/plugins/view/answers/index/index.html b/application/plugins/view/answers/index/index/index.html
similarity index 97%
rename from application/plugins/view/answers/index/index.html
rename to application/plugins/view/answers/index/index/index.html
index 3a613090b..edab0b748 100755
--- a/application/plugins/view/answers/index/index.html
+++ b/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 -->
 
diff --git a/application/plugins/view/answers/index/search.html b/application/plugins/view/answers/index/index/search.html
similarity index 96%
rename from application/plugins/view/answers/index/search.html
rename to application/plugins/view/answers/index/index/search.html
index 8f067a399..45dad575a 100755
--- a/application/plugins/view/answers/index/search.html
+++ b/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 -->
 
diff --git a/application/plugins/view/answers/index/operation.html b/application/plugins/view/answers/index/public/operation.html
similarity index 100%
rename from application/plugins/view/answers/index/operation.html
rename to application/plugins/view/answers/index/public/operation.html
diff --git a/application/plugins/view/answers/index/popup.html b/application/plugins/view/answers/index/public/popup.html
similarity index 100%
rename from application/plugins/view/answers/index/popup.html
rename to application/plugins/view/answers/index/public/popup.html
diff --git a/application/plugins/view/commongobacktop/admin/index.html b/application/plugins/view/commongobacktop/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/commongobacktop/admin/index.html
rename to application/plugins/view/commongobacktop/admin/admin/index.html
diff --git a/application/plugins/view/commongobacktop/admin/saveinfo.html b/application/plugins/view/commongobacktop/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/commongobacktop/admin/saveinfo.html
rename to application/plugins/view/commongobacktop/admin/admin/saveinfo.html
diff --git a/application/plugins/view/commongobacktop/index/content.html b/application/plugins/view/commongobacktop/index/public/content.html
similarity index 100%
rename from application/plugins/view/commongobacktop/index/content.html
rename to application/plugins/view/commongobacktop/index/public/content.html
diff --git a/application/plugins/view/commononlineservice/admin/index.html b/application/plugins/view/commononlineservice/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/commononlineservice/admin/index.html
rename to application/plugins/view/commononlineservice/admin/admin/index.html
diff --git a/application/plugins/view/commononlineservice/admin/saveinfo.html b/application/plugins/view/commononlineservice/admin/admin/saveinfo.html
similarity index 93%
rename from application/plugins/view/commononlineservice/admin/saveinfo.html
rename to application/plugins/view/commononlineservice/admin/admin/saveinfo.html
index d1cfc302b..c82978ed6 100755
--- a/application/plugins/view/commononlineservice/admin/saveinfo.html
+++ b/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>
 
diff --git a/application/plugins/view/commononlineservice/index/content.html b/application/plugins/view/commononlineservice/index/public/content.html
similarity index 100%
rename from application/plugins/view/commononlineservice/index/content.html
rename to application/plugins/view/commononlineservice/index/public/content.html
diff --git a/application/plugins/view/commonrightnavigation/admin/index.html b/application/plugins/view/commonrightnavigation/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/commonrightnavigation/admin/index.html
rename to application/plugins/view/commonrightnavigation/admin/admin/index.html
diff --git a/application/plugins/view/commonrightnavigation/admin/saveinfo.html b/application/plugins/view/commonrightnavigation/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/commonrightnavigation/admin/saveinfo.html
rename to application/plugins/view/commonrightnavigation/admin/admin/saveinfo.html
diff --git a/application/plugins/view/commonrightnavigation/index/content.html b/application/plugins/view/commonrightnavigation/index/public/content.html
similarity index 100%
rename from application/plugins/view/commonrightnavigation/index/content.html
rename to application/plugins/view/commonrightnavigation/index/public/content.html
diff --git a/application/plugins/view/commontopmaxpicture/admin/index.html b/application/plugins/view/commontopmaxpicture/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/commontopmaxpicture/admin/index.html
rename to application/plugins/view/commontopmaxpicture/admin/admin/index.html
diff --git a/application/plugins/view/commontopmaxpicture/admin/saveinfo.html b/application/plugins/view/commontopmaxpicture/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/commontopmaxpicture/admin/saveinfo.html
rename to application/plugins/view/commontopmaxpicture/admin/admin/saveinfo.html
diff --git a/application/plugins/view/commontopmaxpicture/index/content.html b/application/plugins/view/commontopmaxpicture/index/public/content.html
similarity index 100%
rename from application/plugins/view/commontopmaxpicture/index/content.html
rename to application/plugins/view/commontopmaxpicture/index/public/content.html
diff --git a/application/plugins/view/commontopnotice/admin/index.html b/application/plugins/view/commontopnotice/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/commontopnotice/admin/index.html
rename to application/plugins/view/commontopnotice/admin/admin/index.html
diff --git a/application/plugins/view/commontopnotice/admin/saveinfo.html b/application/plugins/view/commontopnotice/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/commontopnotice/admin/saveinfo.html
rename to application/plugins/view/commontopnotice/admin/admin/saveinfo.html
diff --git a/application/plugins/view/commontopnotice/index/content.html b/application/plugins/view/commontopnotice/index/public/content.html
similarity index 100%
rename from application/plugins/view/commontopnotice/index/content.html
rename to application/plugins/view/commontopnotice/index/public/content.html
diff --git a/application/plugins/view/expressforkdn/admin/index.html b/application/plugins/view/expressforkdn/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/expressforkdn/admin/index.html
rename to application/plugins/view/expressforkdn/admin/admin/index.html
diff --git a/application/plugins/view/expressforkdn/admin/saveinfo.html b/application/plugins/view/expressforkdn/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/expressforkdn/admin/saveinfo.html
rename to application/plugins/view/expressforkdn/admin/admin/saveinfo.html
diff --git a/application/plugins/view/expressforkdn/admin/content.html b/application/plugins/view/expressforkdn/index/public/content.html
similarity index 100%
rename from application/plugins/view/expressforkdn/admin/content.html
rename to application/plugins/view/expressforkdn/index/public/content.html
diff --git a/application/plugins/view/footercustomerservice/admin/dataindex.html b/application/plugins/view/footercustomerservice/admin/admin/dataindex.html
similarity index 100%
rename from application/plugins/view/footercustomerservice/admin/dataindex.html
rename to application/plugins/view/footercustomerservice/admin/admin/dataindex.html
diff --git a/application/plugins/view/footercustomerservice/admin/datainfo.html b/application/plugins/view/footercustomerservice/admin/admin/datainfo.html
similarity index 100%
rename from application/plugins/view/footercustomerservice/admin/datainfo.html
rename to application/plugins/view/footercustomerservice/admin/admin/datainfo.html
diff --git a/application/plugins/view/footercustomerservice/admin/index.html b/application/plugins/view/footercustomerservice/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/footercustomerservice/admin/index.html
rename to application/plugins/view/footercustomerservice/admin/admin/index.html
diff --git a/application/plugins/view/footercustomerservice/admin/saveinfo.html b/application/plugins/view/footercustomerservice/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/footercustomerservice/admin/saveinfo.html
rename to application/plugins/view/footercustomerservice/admin/admin/saveinfo.html
diff --git a/application/plugins/view/footercustomerservice/index/content.html b/application/plugins/view/footercustomerservice/index/public/content.html
similarity index 100%
rename from application/plugins/view/footercustomerservice/index/content.html
rename to application/plugins/view/footercustomerservice/index/public/content.html
diff --git a/application/plugins/view/freightfee/admin/index.html b/application/plugins/view/freightfee/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/freightfee/admin/index.html
rename to application/plugins/view/freightfee/admin/admin/index.html
diff --git a/application/plugins/view/freightfee/admin/saveinfo.html b/application/plugins/view/freightfee/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/freightfee/admin/saveinfo.html
rename to application/plugins/view/freightfee/admin/admin/saveinfo.html
diff --git a/application/plugins/view/homemiddleadv/admin/dataindex.html b/application/plugins/view/homemiddleadv/admin/admin/dataindex.html
similarity index 100%
rename from application/plugins/view/homemiddleadv/admin/dataindex.html
rename to application/plugins/view/homemiddleadv/admin/admin/dataindex.html
diff --git a/application/plugins/view/homemiddleadv/admin/datainfo.html b/application/plugins/view/homemiddleadv/admin/admin/datainfo.html
similarity index 100%
rename from application/plugins/view/homemiddleadv/admin/datainfo.html
rename to application/plugins/view/homemiddleadv/admin/admin/datainfo.html
diff --git a/application/plugins/view/homemiddleadv/admin/index.html b/application/plugins/view/homemiddleadv/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/homemiddleadv/admin/index.html
rename to application/plugins/view/homemiddleadv/admin/admin/index.html
diff --git a/application/plugins/view/homemiddleadv/admin/saveinfo.html b/application/plugins/view/homemiddleadv/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/homemiddleadv/admin/saveinfo.html
rename to application/plugins/view/homemiddleadv/admin/admin/saveinfo.html
diff --git a/application/plugins/view/homemiddleadv/index/content.html b/application/plugins/view/homemiddleadv/index/public/content.html
similarity index 100%
rename from application/plugins/view/homemiddleadv/index/content.html
rename to application/plugins/view/homemiddleadv/index/public/content.html
diff --git a/application/plugins/view/membershiplevel/admin/index.html b/application/plugins/view/membershiplevel/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/membershiplevel/admin/index.html
rename to application/plugins/view/membershiplevel/admin/admin/index.html
diff --git a/application/plugins/view/membershiplevel/admin/saveinfo.html b/application/plugins/view/membershiplevel/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/membershiplevel/admin/saveinfo.html
rename to application/plugins/view/membershiplevel/admin/admin/saveinfo.html
diff --git a/application/plugins/view/membershiplevel/level/index.html b/application/plugins/view/membershiplevel/admin/level/index.html
similarity index 100%
rename from application/plugins/view/membershiplevel/level/index.html
rename to application/plugins/view/membershiplevel/admin/level/index.html
diff --git a/application/plugins/view/membershiplevel/level/saveinfo.html b/application/plugins/view/membershiplevel/admin/level/saveinfo.html
similarity index 100%
rename from application/plugins/view/membershiplevel/level/saveinfo.html
rename to application/plugins/view/membershiplevel/admin/level/saveinfo.html
diff --git a/application/plugins/view/newuserreduction/admin/index.html b/application/plugins/view/newuserreduction/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/newuserreduction/admin/index.html
rename to application/plugins/view/newuserreduction/admin/admin/index.html
diff --git a/application/plugins/view/newuserreduction/admin/saveinfo.html b/application/plugins/view/newuserreduction/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/newuserreduction/admin/saveinfo.html
rename to application/plugins/view/newuserreduction/admin/admin/saveinfo.html
diff --git a/application/plugins/view/share/admin/index.html b/application/plugins/view/share/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/share/admin/index.html
rename to application/plugins/view/share/admin/admin/index.html
diff --git a/application/plugins/view/share/admin/saveinfo.html b/application/plugins/view/share/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/share/admin/saveinfo.html
rename to application/plugins/view/share/admin/admin/saveinfo.html
diff --git a/application/plugins/view/share/index/content.html b/application/plugins/view/share/index/public/content.html
similarity index 100%
rename from application/plugins/view/share/index/content.html
rename to application/plugins/view/share/index/public/content.html
diff --git a/application/plugins/view/share/index/share.html b/application/plugins/view/share/index/public/share.html
similarity index 100%
rename from application/plugins/view/share/index/share.html
rename to application/plugins/view/share/index/public/share.html
diff --git a/application/plugins/view/touristbuy/admin/index.html b/application/plugins/view/touristbuy/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/touristbuy/admin/index.html
rename to application/plugins/view/touristbuy/admin/admin/index.html
diff --git a/application/plugins/view/touristbuy/admin/saveinfo.html b/application/plugins/view/touristbuy/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/touristbuy/admin/saveinfo.html
rename to application/plugins/view/touristbuy/admin/admin/saveinfo.html
diff --git a/application/plugins/view/touristbuy/index/detail.html b/application/plugins/view/touristbuy/index/index/detail.html
similarity index 100%
rename from application/plugins/view/touristbuy/index/detail.html
rename to application/plugins/view/touristbuy/index/index/detail.html
diff --git a/application/plugins/view/touristbuy/index/index.html b/application/plugins/view/touristbuy/index/index/index.html
similarity index 100%
rename from application/plugins/view/touristbuy/index/index.html
rename to application/plugins/view/touristbuy/index/index/index.html
diff --git a/application/plugins/view/touristbuy/index/success.html b/application/plugins/view/touristbuy/index/index/success.html
similarity index 100%
rename from application/plugins/view/touristbuy/index/success.html
rename to application/plugins/view/touristbuy/index/index/success.html
diff --git a/application/plugins/view/ucenter/admin/index.html b/application/plugins/view/ucenter/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/ucenter/admin/index.html
rename to application/plugins/view/ucenter/admin/admin/index.html
diff --git a/application/plugins/view/ucenter/admin/saveinfo.html b/application/plugins/view/ucenter/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/ucenter/admin/saveinfo.html
rename to application/plugins/view/ucenter/admin/admin/saveinfo.html
diff --git a/application/plugins/view/usercentertopnotice/admin/index.html b/application/plugins/view/usercentertopnotice/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/usercentertopnotice/admin/index.html
rename to application/plugins/view/usercentertopnotice/admin/admin/index.html
diff --git a/application/plugins/view/usercentertopnotice/admin/saveinfo.html b/application/plugins/view/usercentertopnotice/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/usercentertopnotice/admin/saveinfo.html
rename to application/plugins/view/usercentertopnotice/admin/admin/saveinfo.html
diff --git a/application/plugins/view/usercentertopnotice/index/content.html b/application/plugins/view/usercentertopnotice/index/content.html
deleted file mode 100755
index d2f141836..000000000
--- a/application/plugins/view/usercentertopnotice/index/content.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="am-alert am-alert-warning am-radius" style="margin: 0;">
-    <div class="am-container">{{$data.content}}</div>
-</div>
\ No newline at end of file
diff --git a/application/plugins/view/ucenter/index/content.html b/application/plugins/view/usercentertopnotice/index/public/content.html
similarity index 100%
rename from application/plugins/view/ucenter/index/content.html
rename to application/plugins/view/usercentertopnotice/index/public/content.html
diff --git a/application/plugins/view/userloginrewardintegral/admin/index.html b/application/plugins/view/userloginrewardintegral/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/userloginrewardintegral/admin/index.html
rename to application/plugins/view/userloginrewardintegral/admin/admin/index.html
diff --git a/application/plugins/view/userloginrewardintegral/admin/saveinfo.html b/application/plugins/view/userloginrewardintegral/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/userloginrewardintegral/admin/saveinfo.html
rename to application/plugins/view/userloginrewardintegral/admin/admin/saveinfo.html
diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/index.html b/application/plugins/view/usernotloginhidegoodsprice/admin/admin/index.html
similarity index 100%
rename from application/plugins/view/usernotloginhidegoodsprice/admin/index.html
rename to application/plugins/view/usernotloginhidegoodsprice/admin/admin/index.html
diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html b/application/plugins/view/usernotloginhidegoodsprice/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html
rename to application/plugins/view/usernotloginhidegoodsprice/admin/admin/saveinfo.html
diff --git a/application/plugins/view/wallet/admin/index.html b/application/plugins/view/wallet/admin/admin/index.html
similarity index 98%
rename from application/plugins/view/wallet/admin/index.html
rename to application/plugins/view/wallet/admin/admin/index.html
index bd1db0164..d89ee425c 100755
--- a/application/plugins/view/wallet/admin/index.html
+++ b/application/plugins/view/wallet/admin/admin/index.html
@@ -96,7 +96,7 @@
                                     <span>用户</span>
                                     <span class="animation-count-to" data-to="12" data-speed="1500">12</span>
                                 </div>
-                                <a href="{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}" class="view-to">查看 <i class="am-icon-angle-double-right"></i></a>
+                                <a href="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" class="view-to">查看 <i class="am-icon-angle-double-right"></i></a>
                             </div>
                         </li>
                         <li class="module-cash">
diff --git a/application/plugins/view/wallet/admin/saveinfo.html b/application/plugins/view/wallet/admin/admin/saveinfo.html
similarity index 100%
rename from application/plugins/view/wallet/admin/saveinfo.html
rename to application/plugins/view/wallet/admin/admin/saveinfo.html
diff --git a/application/plugins/view/wallet/walletadmin/index.html b/application/plugins/view/wallet/admin/wallet/index.html
similarity index 97%
rename from application/plugins/view/wallet/walletadmin/index.html
rename to application/plugins/view/wallet/admin/wallet/index.html
index 554cfe5b8..b8bfd54cb 100644
--- a/application/plugins/view/wallet/walletadmin/index.html
+++ b/application/plugins/view/wallet/admin/wallet/index.html
@@ -10,7 +10,7 @@
 
         <div class="wallet-content">
             <!-- form start -->
-            <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}" method="POST">
+            <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" method="POST">
                 <div class="am-g">
                     <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名/昵称/手机/邮箱" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
                     <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
@@ -81,7 +81,7 @@
                                 <td>{{$v.status_text}}</td>
                                 <td class="am-hide-sm-only">{{$v.add_time_text}}</td>
                                 <td class="view-operation">
-                                    <a href="{{:PluginsAdminUrl('wallet', 'walletadmin', 'saveinfo', ['id'=>$v['id']])}}">
+                                    <a href="{{:PluginsAdminUrl('wallet', 'wallet', 'saveinfo', ['id'=>$v['id']])}}">
                                         <button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
                                     </a>
                                 </td>
diff --git a/application/plugins/view/wallet/walletadmin/saveinfo.html b/application/plugins/view/wallet/admin/wallet/saveinfo.html
similarity index 93%
rename from application/plugins/view/wallet/walletadmin/saveinfo.html
rename to application/plugins/view/wallet/admin/wallet/saveinfo.html
index 759b89fee..2add0d8a0 100644
--- a/application/plugins/view/wallet/walletadmin/saveinfo.html
+++ b/application/plugins/view/wallet/admin/wallet/saveinfo.html
@@ -5,13 +5,13 @@
     <div class="content">
         <legend>
             <span class="fs-16">钱包编辑</span>
-            <a href="{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+            <a href="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
         </legend>
 
         <div class="wallet-content">
             {{if !empty($data)}}
                 <!-- form start -->
-                <form class="am-form form-validation view-save" action="{{:PluginsAdminUrl('wallet', 'walletadmin', 'save')}}" method="POST" request-type="ajax-url" request-value="{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}" enctype="multipart/form-data">
+                <form class="am-form form-validation view-save" action="{{:PluginsAdminUrl('wallet', 'wallet', 'save')}}" method="POST" request-type="ajax-url" request-value="{{:PluginsAdminUrl('wallet', 'wallet', 'index')}}" enctype="multipart/form-data">
                     <div class="am-alert am-alert-secondary saveinfo-view" data-am-alert="">
                         <div>
                             <span>有效金额：</span>
diff --git a/application/plugins/view/wallet/cash/authinfo.html b/application/plugins/view/wallet/index/cash/authinfo.html
similarity index 98%
rename from application/plugins/view/wallet/cash/authinfo.html
rename to application/plugins/view/wallet/index/cash/authinfo.html
index 702d45dfc..e6806e141 100644
--- a/application/plugins/view/wallet/cash/authinfo.html
+++ b/application/plugins/view/wallet/index/cash/authinfo.html
@@ -23,7 +23,7 @@
     <div class="user-content">
         <div class="user-content-body">
             <!-- user menu start -->
-            {{include file="../../../plugins/view/wallet/public/nav" /}}
+            {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
             <!-- tips start -->
diff --git a/application/plugins/view/wallet/cash/createinfo.html b/application/plugins/view/wallet/index/cash/createinfo.html
similarity index 97%
rename from application/plugins/view/wallet/cash/createinfo.html
rename to application/plugins/view/wallet/index/cash/createinfo.html
index 4a35be8e5..8cd290514 100644
--- a/application/plugins/view/wallet/cash/createinfo.html
+++ b/application/plugins/view/wallet/index/cash/createinfo.html
@@ -23,7 +23,7 @@
     <div class="user-content">
         <div class="user-content-body">
             <!-- user menu start -->
-            {{include file="../../../plugins/view/wallet/public/nav" /}}
+            {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
             <!-- form start -->
diff --git a/application/plugins/view/wallet/cash/index.html b/application/plugins/view/wallet/index/cash/index.html
similarity index 98%
rename from application/plugins/view/wallet/cash/index.html
rename to application/plugins/view/wallet/index/cash/index.html
index 8f5fc95ca..30745e1f0 100755
--- a/application/plugins/view/wallet/cash/index.html
+++ b/application/plugins/view/wallet/index/cash/index.html
@@ -23,7 +23,7 @@
     <div class="user-content">
         <div class="user-content-body">
             <!-- user menu start -->
-            {{include file="../../../plugins/view/wallet/public/nav" /}}
+            {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
             <form class="am-form form-validation" method="post" action="{{:PluginsHomeUrl('wallet', 'cash', 'index')}}" request-type="form">
diff --git a/application/plugins/view/wallet/public/nav.html b/application/plugins/view/wallet/index/public/nav.html
similarity index 100%
rename from application/plugins/view/wallet/public/nav.html
rename to application/plugins/view/wallet/index/public/nav.html
diff --git a/application/plugins/view/wallet/recharge/index.html b/application/plugins/view/wallet/index/recharge/index.html
similarity index 97%
rename from application/plugins/view/wallet/recharge/index.html
rename to application/plugins/view/wallet/index/recharge/index.html
index 6a2ada963..14a1377fd 100755
--- a/application/plugins/view/wallet/recharge/index.html
+++ b/application/plugins/view/wallet/index/recharge/index.html
@@ -23,7 +23,7 @@
     <div class="user-content">
         <div class="user-content-body">
             <!-- user menu start -->
-            {{include file="../../../plugins/view/wallet/public/nav" /}}
+            {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
             <form class="am-form form-validation" method="post" action="{{:PluginsHomeUrl('wallet', 'recharge', 'index')}}" request-type="form">
diff --git a/application/plugins/view/wallet/wallet/index.html b/application/plugins/view/wallet/index/wallet/index.html
similarity index 98%
rename from application/plugins/view/wallet/wallet/index.html
rename to application/plugins/view/wallet/index/wallet/index.html
index fe39f8062..8eb667e17 100755
--- a/application/plugins/view/wallet/wallet/index.html
+++ b/application/plugins/view/wallet/index/wallet/index.html
@@ -23,7 +23,7 @@
     <div class="user-content">
         <div class="user-content-body">
             <!-- user menu start -->
-            {{include file="../../../plugins/view/wallet/public/nav" /}}
+            {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
             <form class="am-form form-validation" method="post" action="{{:PluginsHomeUrl('wallet', 'wallet', 'index')}}" request-type="form">
diff --git a/application/plugins/view/wallet/level/index.html b/application/plugins/view/wallet/level/index.html
deleted file mode 100755
index 2423df599..000000000
--- a/application/plugins/view/wallet/level/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{{include file="public/header" /}}
-
-<!-- right content start  -->
-<div class="content-right">
-    <div class="content">
-        {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}}
-            <legend>
-                <span class="fs-16">会员等级</span>
-                <a href="{{:PluginsAdminUrl('membershiplevel', 'admin', 'index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
-            </legend>
-        {{/if}}
-
-        <div class="membershiplevel-content">
-            {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}}
-                <!-- operation start -->
-                <div class="am-g m-t-15 m-b-10">
-                    <a href="{{:PluginsAdminUrl('membershiplevel', 'level', 'saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
-                </div>
-                <!-- operation end -->
-            {{/if}}
-
-            <!-- list start -->
-            <table class="am-table am-table-striped am-table-hover am-text-middle">
-                <thead>
-                    <tr>
-                        <th>名称</th>
-                        <th>图标</th>
-                        <th>规则值</th>
-                        <th>优惠信息</th>
-                        <th class="am-hide-sm-only">是否启用</th>
-                        <th class="am-hide-sm-only">操作时间</th>
-                        {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}}
-                            <th>操作</th>
-                        {{/if}}
-                    </tr>
-                </thead>
-                <tbody>
-                    {{if !empty($data_list)}}
-                        {{foreach $data_list as $v}}
-                            <tr id="data-list-{{$v.id}}" {{if isset($v['is_enable']) and $v['is_enable'] eq 0}}class="am-active"{{/if}}>
-                                <td>{{$v.name}}</td>
-                                <td {{if !empty($v['bg_color'])}}style="background-color:{{$v.bg_color}};"{{/if}}>
-                                    {{if !empty($v['images_url'])}}
-                                        <a href="{{$v['images_url']}}" target="_blank">
-                                            <img src="{{$v['images_url']}}" class="am-radius" width="100" />
-                                        </a>
-                                    {{else /}}
-                                        <span class="cr-ccc">暂无图片</span>
-                                    {{/if}}
-                                </td>
-                                <td>{{$v.rules_min}}~{{$v.rules_max}}</td>
-                                <td>
-                                    满减：{{if $v['order_price'] gt 0 and $v['full_reduction_price'] gt 0}}
-                                        满{{$v.order_price}}元 减{{$v.full_reduction_price}}元
-                                    {{else /}}
-                                        <span class="cr-ccc">无满减</span>
-                                    {{/if}}
-                                    <br />
-                                    折扣：{{if $v['discount_rate']}}
-                                        {{$v.discount_rate}}折
-                                    {{else /}}
-                                        <span class="cr-ccc">无折扣</span>
-                                    {{/if}}
-                                </td>
-                                <td class="am-hide-sm-only">
-                                    <a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if isset($v['is_enable']) and $v['is_enable'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:PluginsAdminUrl('membershiplevel', 'level', 'statusupdate')}}" data-id="{{$v.id}}" data-state="{{if isset($v['is_enable'])}}{{$v['is_enable']}}{{/if}}" data-field="is_enable" data-is-update-status="1"></a>
-                                </td>
-                                <td class="am-hide-sm-only">{{$v.operation_time_time}}</td>
-                                {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}}
-                                    <td class="view-operation">
-                                        <a href="{{:PluginsAdminUrl('membershiplevel', 'level', 'saveinfo', ['id'=>$v['id']])}}">
-                                            <button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
-                                        </a>
-                                        <button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:PluginsAdminUrl('membershiplevel', 'level', 'delete')}}" data-id="{{$v.id}}"> 删除</button>
-                                    </td>
-                                {{/if}}
-                            </tr>
-                        {{/foreach}}
-                    {{else /}}
-                        <tr><td colspan="5" class="table-no">没有相关数据</td></tr>
-                    {{/if}}
-                </tbody>
-            </table>
-            <!-- list end -->
-        </div>
-    </div>
-</div>
-<!-- right content end  -->
-        
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
diff --git a/application/plugins/view/wallet/level/saveinfo.html b/application/plugins/view/wallet/level/saveinfo.html
deleted file mode 100755
index d76b37557..000000000
--- a/application/plugins/view/wallet/level/saveinfo.html
+++ /dev/null
@@ -1,99 +0,0 @@
-{{include file="public/header" /}}
-
-<!-- right content start  -->
-<div class="content-right">
-    <div class="content">
-        <legend>
-            <span class="fs-16">
-                {{if empty($data['id'])}}
-                    会员等级添加
-                {{else /}}
-                    会员等级编辑
-                {{/if}}
-            </span>
-            <a href="{{:PluginsAdminUrl('membershiplevel', 'level', 'index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
-        </legend>
-
-        <div class="membershiplevel-content">
-            <!-- form start -->
-            <form class="am-form form-validation view-save" action="{{:PluginsAdminUrl('membershiplevel', 'level', 'save')}}" method="POST" request-type="ajax-url" request-value="{{:PluginsAdminUrl('membershiplevel', 'level', 'index')}}" enctype="multipart/form-data">
-                <div class="am-form-group">
-                    <label>名称</label>
-                    <input type="text" name="name" placeholder="名称" minlength="1" maxlength="30" data-validation-message="名称格式 1~30 个字符" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
-                </div>
-
-                <div class="am-form-group am-form-file">
-                    <label class="block">图标<span class="am-form-group-label-tips">建议50像数x50像数</span></label>
-                    <ul class="plug-file-upload-view images_url-images-view" data-form-name="images_url" data-max-number="1" data-delete="1" data-dialog-type="images">
-                        {{if !empty($data['images_url'])}}
-                            <li>
-                                <input type="text" name="images_url" value="{{$data.images_url_old}}" data-validation-message="请上传图标" />
-                                <img src="{{$data.images_url}}" />
-                                <i>×</i>
-                            </li>
-                        {{/if}}
-                    </ul>
-                    <div class="plug-file-upload-submit" data-view-tag="ul.images_url-images-view">+上传图标</div>
-                </div>
-                
-                <div class="am-alert am-alert-warning" data-am-alert="">
-                    <button type="button" class="am-close">&times;</button>
-                    <p>
-                        规则举例 <br>
-                        <span class="mini-tips-text">最小规则0 - 最大规则100 则是小于100
-                            <br> 最小规则1000 - 最大规则0 则是大于1000
-                            <br> 最小规则100 - 最大规则500 则是大于等于100并且小于500
-                        </span>
-                    </p>
-                </div>
-                <div class="am-form-group">
-                    <label>规则值</label>
-                    <div class="rules-value">
-                        <input type="number" placeholder="最小值" name="rules_min" step="0.01" data-validation-message="请填写规则最小值" class="am-radius" {{if isset($data['rules_min'])}} value="{{$data.rules_min}}"{{/if}} required />
-                        <span>~</span>
-                        <input type="number" placeholder="最大值" step="0.01" name="rules_max" data-validation-message="请填写规则最大值" class="am-radius" {{if isset($data['rules_max'])}} value="{{$data.rules_max}}"{{/if}} required />
-                    </div>
-                </div>
-
-                <div class="am-alert am-alert-warning" data-am-alert="">
-                    <button type="button" class="am-close">&times;</button>
-                    <p>
-                        优惠说明 <br>
-                        <span class="mini-tips-text">
-                            满减优惠 与 折扣率可<span class="cr-red">叠加使用</span>，如需只使用其中一项优惠，则请注意只需配置该优惠项即可！！！
-                        </span>
-                    </p>
-                </div>
-                <div class="am-form-group">
-                    <label>满减优惠<span class="am-form-group-label-tips">计算规则，大于等于[订单满金额]则减[满减金额](不含运费)，空或0则无优惠</span></label>
-                    <div class="full-reduction-value">
-                        <span>满</span>
-                        <input type="number" name="order_price" min="0.00" step="0.01" placeholder="订单满金额" data-validation-message="请输入有效的订单满金额" class="am-radius" {{if !empty($data['order_price'])}} value="{{$data.order_price}}"{{/if}} />
-                        <span>减</span>
-                        <input type="number" name="full_reduction_price" min="0.00" step="0.01" placeholder="满减金额" data-validation-message="请输入有效的满减金额" class="am-radius" {{if !empty($data['full_reduction_price'])}} value="{{$data.full_reduction_price}}"{{/if}} />
-                    </div>
-                </div>
-                <div class="am-form-group">
-                    <label>折扣率<span class="am-form-group-label-tips">空或0则无折扣，最大0.99</span></label>
-                    <input type="number" name="discount_rate" placeholder="折扣率" min="0.00" max="0.99" step="0.01" data-validation-message="折扣率应输入 0.00~0.99 的数字,小数保留两位" class="am-radius" {{if !empty($data['discount_rate'])}} value="{{$data.discount_rate}}"{{/if}} />
-                </div>
-
-                <div class="am-form-group">
-                    <label class="block">是否启用</label>
-                    <input name="is_enable" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_enable']) and $data['is_enable'] eq 1) or empty($data)}}checked="true"{{/if}} />
-                </div>
-
-                <div class="am-form-group am-form-group-refreshing">
-                    <input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
-                    <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100" data-am-loading="{loadingText:'处理中...'}">保存</button>
-                </div>
-            </form>
-            <!-- form end -->
-        </div>
-    </div>
-</div>
-<!-- right content end  -->
-        
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
diff --git a/application/plugins/wallet/Admin.php b/application/plugins/wallet/admin/Admin.php
similarity index 97%
rename from application/plugins/wallet/Admin.php
rename to application/plugins/wallet/admin/Admin.php
index 2bc8750e8..6f93ecab9 100755
--- a/application/plugins/wallet/Admin.php
+++ b/application/plugins/wallet/admin/Admin.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\admin;
 
 use think\Controller;
 use app\plugins\wallet\service\BaseService;
@@ -37,7 +37,7 @@ class Admin extends Controller
         if($ret['code'] == 0)
         {            
             $this->assign('data', $ret['data']);
-            return $this->fetch('../../../plugins/view/wallet/admin/index');
+            return $this->fetch('../../../plugins/view/wallet/admin/admin/index');
         } else {
             return $ret['msg'];
         }
@@ -71,7 +71,7 @@ class Admin extends Controller
             $this->assign('recharge_give_type_list', $recharge_give_type_list);
 
             $this->assign('data', $ret['data']);
-            return $this->fetch('../../../plugins/view/wallet/admin/saveinfo');
+            return $this->fetch('../../../plugins/view/wallet/admin/admin/saveinfo');
         } else {
             return $ret['msg'];
         }
diff --git a/application/plugins/wallet/Walletadmin.php b/application/plugins/wallet/admin/Wallet.php
similarity index 94%
rename from application/plugins/wallet/Walletadmin.php
rename to application/plugins/wallet/admin/Wallet.php
index 74fe7323c..d64140b7e 100644
--- a/application/plugins/wallet/Walletadmin.php
+++ b/application/plugins/wallet/admin/Wallet.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\admin;
 
 use think\Controller;
 use app\plugins\wallet\service\WalletService;
@@ -21,7 +21,7 @@ use app\plugins\wallet\service\BaseService;
  * @version  0.0.1
  * @datetime 2016-12-01T21:51:08+0800
  */
-class Walletadmin extends Controller
+class Wallet extends Controller
 {
     /**
      * 首页
@@ -72,7 +72,7 @@ class Walletadmin extends Controller
 
         // 参数
         $this->assign('params', $params);
-        return $this->fetch('../../../plugins/view/wallet/walletadmin/index');
+        return $this->fetch('../../../plugins/view/wallet/admin/wallet/index');
     }
 
     /**
@@ -109,7 +109,7 @@ class Walletadmin extends Controller
         }
 
         $this->assign('data', $data);
-        return $this->fetch('../../../plugins/view/wallet/walletadmin/saveinfo');
+        return $this->fetch('../../../plugins/view/wallet/admin/wallet/saveinfo');
     }
 
     /**
diff --git a/application/plugins/wallet/Cash.php b/application/plugins/wallet/index/Cash.php
similarity index 94%
rename from application/plugins/wallet/Cash.php
rename to application/plugins/wallet/index/Cash.php
index c9ba46741..f1cede716 100644
--- a/application/plugins/wallet/Cash.php
+++ b/application/plugins/wallet/index/Cash.php
@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\index;
 
-use app\plugins\wallet\Common;
+use app\plugins\wallet\index\Common;
 use app\plugins\wallet\service\CashService;
 use app\plugins\wallet\service\BaseService;
 
@@ -83,7 +83,7 @@ class Cash extends Common
 
         // 参数
         $this->assign('params', $params);
-        return $this->fetch('../../../plugins/view/wallet/cash/index');
+        return $this->fetch('../../../plugins/view/wallet/index/cash/index');
     }
 
     /**
@@ -105,7 +105,7 @@ class Cash extends Common
 
         // 参数
         $this->assign('params', $params);
-        return $this->fetch('../../../plugins/view/wallet/cash/authinfo');
+        return $this->fetch('../../../plugins/view/wallet/index/cash/authinfo');
     }
 
     /**
@@ -120,7 +120,7 @@ class Cash extends Common
     {
         // 参数
         $this->assign('params', $params);
-        return $this->fetch('../../../plugins/view/wallet/cash/createinfo');
+        return $this->fetch('../../../plugins/view/wallet/index/cash/createinfo');
     }
 
     /**
diff --git a/application/plugins/wallet/Common.php b/application/plugins/wallet/index/Common.php
similarity index 98%
rename from application/plugins/wallet/Common.php
rename to application/plugins/wallet/index/Common.php
index 26682ea59..6af88424d 100644
--- a/application/plugins/wallet/Common.php
+++ b/application/plugins/wallet/index/Common.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\index;
 
 use think\Controller;
 use app\service\UserService;
diff --git a/application/plugins/wallet/Recharge.php b/application/plugins/wallet/index/Recharge.php
similarity index 97%
rename from application/plugins/wallet/Recharge.php
rename to application/plugins/wallet/index/Recharge.php
index 793bdef59..be977da46 100755
--- a/application/plugins/wallet/Recharge.php
+++ b/application/plugins/wallet/index/Recharge.php
@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\index;
 
-use app\plugins\wallet\Common;
+use app\plugins\wallet\index\Common;
 use app\plugins\wallet\service\BaseService;
 use app\plugins\wallet\service\PayService;
 use app\plugins\wallet\service\RechargeService;
@@ -81,7 +81,7 @@ class Recharge extends Common
 
         // 参数
         $this->assign('params', $params);
-        return $this->fetch('../../../plugins/view/wallet/recharge/index');
+        return $this->fetch('../../../plugins/view/wallet/index/recharge/index');
     }
 
     /**
diff --git a/application/plugins/wallet/Rechargenotify.php b/application/plugins/wallet/index/Rechargenotify.php
similarity index 96%
rename from application/plugins/wallet/Rechargenotify.php
rename to application/plugins/wallet/index/Rechargenotify.php
index 43de9dc49..379251ae3 100644
--- a/application/plugins/wallet/Rechargenotify.php
+++ b/application/plugins/wallet/index/Rechargenotify.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\index;
 
 use app\plugins\wallet\service\PayService;
 
diff --git a/application/plugins/wallet/Wallet.php b/application/plugins/wallet/index/Wallet.php
similarity index 94%
rename from application/plugins/wallet/Wallet.php
rename to application/plugins/wallet/index/Wallet.php
index 73f086273..7a85d245c 100644
--- a/application/plugins/wallet/Wallet.php
+++ b/application/plugins/wallet/index/Wallet.php
@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: Devil
 // +----------------------------------------------------------------------
-namespace app\plugins\wallet;
+namespace app\plugins\wallet\index;
 
-use app\plugins\wallet\Common;
+use app\plugins\wallet\index\Common;
 use app\plugins\wallet\service\BaseService;
 use app\plugins\wallet\service\WalletService;
 
@@ -85,7 +85,7 @@ class Wallet extends Common
 
         // 参数
         $this->assign('params', $params);
-        return $this->fetch('../../../plugins/view/wallet/wallet/index');
+        return $this->fetch('../../../plugins/view/wallet/index/wallet/index');
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php
index 731ea3ce5..810ea4f49 100755
--- a/application/service/PluginsAdminService.php
+++ b/application/service/PluginsAdminService.php
@@ -493,7 +493,7 @@ class PluginsAdminService
         $plugins = trim($params['plugins']);
 $admin=<<<php
 <?php
-namespace app\plugins\\$plugins;
+namespace app\plugins\\$plugins\admin;
 
 use think\Controller;
 
@@ -512,7 +512,7 @@ class Admin extends Controller
         // 数组组装
         \$this->assign('data', ['hello', 'world!']);
         \$this->assign('msg', 'hello world! admin');
-        return \$this->fetch('../../../plugins/view/$plugins/admin/index');
+        return \$this->fetch('../../../plugins/view/$plugins/admin/admin/index');
     }
 }
 ?>
@@ -557,7 +557,7 @@ php;
 
 $index=<<<php
 <?php
-namespace app\plugins\\$plugins;
+namespace app\plugins\\$plugins\index;
 
 use think\Controller;
 
@@ -576,7 +576,7 @@ class Index extends Controller
         // 数组组装
         \$this->assign('data', ['hello', 'world!']);
         \$this->assign('msg', 'hello world! index');
-        return \$this->fetch('../../../plugins/view/$plugins/index/index');
+        return \$this->fetch('../../../plugins/view/$plugins/index/index/index');
     }
 }
 ?>
@@ -669,18 +669,24 @@ php;
         // 编辑模式下不生成后端文件
         if(empty($params['id']))
         {
-            // 创建文件
-            if(@file_put_contents($app_dir.DS.'Admin.php', $admin) === false)
+            // 后端admin目录创建
+            if(\base\FileUtil::CreateDir($app_dir.DS.'admin') !== true)
             {
-                return DataReturn('应用文件创建失败[admin]', -11);
+                return DataReturn('应用后端目录创建失败[admin]', -10);
+            }
+
+            // 创建文件
+            if(@file_put_contents($app_dir.DS.'admin'.DS.'Admin.php', $admin) === false)
+            {
+                return DataReturn('应用文件创建失败[Admin.php]', -11);
             }
             if(@file_put_contents($app_dir.DS.'Hook.php', $hook) === false)
             {
-                return DataReturn('应用文件创建失败[hook]', -11);
+                return DataReturn('应用文件创建失败[Hook.php]', -11);
             }
 
             // 应用后台视图目录不存在则创建
-            $app_view_admin_dir = APP_PATH.'plugins'.DS.'view'.DS.trim($params['plugins']).DS.'admin';
+            $app_view_admin_dir = APP_PATH.'plugins'.DS.'view'.DS.trim($params['plugins']).DS.'admin'.DS.'admin';
             if(\base\FileUtil::CreateDir($app_view_admin_dir) !== true)
             {
                 return DataReturn('应用视图目录创建失败[admin]', -10);
@@ -701,14 +707,20 @@ php;
         // 是否有前端页面
         if(isset($params['is_home']) && $params['is_home'] == 1)
         {
+            // 前端index目录创建
+            if(\base\FileUtil::CreateDir($app_dir.DS.'index') !== true)
+            {
+                return DataReturn('应用前端目录创建失败[index]', -10);
+            }
+
             // 创建文件
-            if(!file_exists($app_dir.DS.'Index.php') && @file_put_contents($app_dir.DS.'Index.php', $index) === false)
+            if(!file_exists($app_dir.DS.'index'.DS.'Index.php') && @file_put_contents($app_dir.DS.'index'.DS.'Index.php', $index) === false)
             {
                 return DataReturn('应用文件创建失败[index]', -11);
             }
 
             // 应用前端视图目录不存在则创建
-            $app_view_index_dir = APP_PATH.'plugins'.DS.'view'.DS.trim($params['plugins']).DS.'index';
+            $app_view_index_dir = APP_PATH.'plugins'.DS.'view'.DS.trim($params['plugins']).DS.'index'.DS.'index';
             if(!is_dir($app_view_index_dir) && \base\FileUtil::CreateDir($app_view_index_dir) !== true)
             {
                 return DataReturn('应用视图目录创建失败[index]', -10);
@@ -732,7 +744,7 @@ php;
 
         // 没有独立前端页面则删除文件
         } else {
-            \base\FileUtil::UnlinkFile($app_dir.DS.'Index.php');
+            \base\FileUtil::UnlinkFile($app_dir.DS.'index'.DS.'Index.php');
             \base\FileUtil::UnlinkDir(APP_PATH.'plugins'.DS.'view'.DS.trim($params['plugins']).DS.'index');
             \base\FileUtil::UnlinkFile($app_static_css_dir.DS.'index'.DS.'index.css');
         }
diff --git a/application/tags.php b/application/tags.php
index 51745d173..e0dae2381 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -45,17 +45,45 @@ return array (
   'plugins_service_user_login_end' => 
   array (
     0 => 'app\\plugins\\userloginrewardintegral\\Hook',
+    1 => 'app\\plugins\\ucenter\\Hook',
+  ),
+  'plugins_css' => 
+  array (
+    0 => 'app\\plugins\\commonrightnavigation\\Hook',
+    1 => 'app\\plugins\\commononlineservice\\Hook',
+    2 => 'app\\plugins\\freightfee\\Hook',
+    3 => 'app\\plugins\\share\\Hook',
+    4 => 'app\\plugins\\footercustomerservice\\Hook',
+    5 => 'app\\plugins\\membershiplevel\\Hook',
+  ),
+  'plugins_js' => 
+  array (
+    0 => 'app\\plugins\\commonrightnavigation\\Hook',
+    1 => 'app\\plugins\\commononlineservice\\Hook',
+    2 => 'app\\plugins\\share\\Hook',
+  ),
+  'plugins_view_common_bottom' => 
+  array (
+    0 => 'app\\plugins\\commonrightnavigation\\Hook',
+    1 => 'app\\plugins\\commononlineservice\\Hook',
+    2 => 'app\\plugins\\expressforkdn\\Hook',
+    3 => 'app\\plugins\\share\\Hook',
+  ),
+  'plugins_service_goods_handle_end' => 
+  array (
+    0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
+    1 => 'app\\plugins\\membershiplevel\\Hook',
+  ),
+  'plugins_service_goods_spec_base' => 
+  array (
+    0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
+    1 => 'app\\plugins\\membershiplevel\\Hook',
   ),
   'plugins_service_navigation_header_handle' => 
   array (
     0 => 'app\\plugins\\answers\\Hook',
     1 => 'app\\plugins\\touristbuy\\Hook',
   ),
-  'plugins_view_common_bottom' => 
-  array (
-    0 => 'app\\plugins\\expressforkdn\\Hook',
-    1 => 'app\\plugins\\share\\Hook',
-  ),
   'plugins_admin_view_common_bottom' => 
   array (
     0 => 'app\\plugins\\expressforkdn\\Hook',
@@ -102,13 +130,6 @@ return array (
   array (
     0 => 'app\\plugins\\touristbuy\\Hook',
   ),
-  'plugins_css' => 
-  array (
-    0 => 'app\\plugins\\freightfee\\Hook',
-    1 => 'app\\plugins\\share\\Hook',
-    2 => 'app\\plugins\\footercustomerservice\\Hook',
-    3 => 'app\\plugins\\membershiplevel\\Hook',
-  ),
   'plugins_service_buy_handle' => 
   array (
     0 => 'app\\plugins\\freightfee\\Hook',
@@ -119,9 +140,21 @@ return array (
   array (
     0 => 'app\\plugins\\freightfee\\Hook',
   ),
-  'plugins_js' => 
+  'plugins_service_user_register_end' => 
   array (
-    0 => 'app\\plugins\\share\\Hook',
+    0 => 'app\\plugins\\ucenter\\Hook',
+  ),
+  'plugins_service_user_logout_handle' => 
+  array (
+    0 => 'app\\plugins\\ucenter\\Hook',
+  ),
+  'plugins_service_user_login_pwd_update' => 
+  array (
+    0 => 'app\\plugins\\ucenter\\Hook',
+  ),
+  'plugins_service_user_accounts_update' => 
+  array (
+    0 => 'app\\plugins\\ucenter\\Hook',
   ),
   'plugins_view_goods_detail_photo_bottom' => 
   array (
@@ -135,14 +168,6 @@ return array (
   array (
     0 => 'app\\plugins\\footercustomerservice\\Hook',
   ),
-  'plugins_service_goods_handle_end' => 
-  array (
-    0 => 'app\\plugins\\membershiplevel\\Hook',
-  ),
-  'plugins_service_goods_spec_base' => 
-  array (
-    0 => 'app\\plugins\\membershiplevel\\Hook',
-  ),
   'plugins_service_user_login_success_record' => 
   array (
     0 => 'app\\plugins\\membershiplevel\\Hook',
diff --git a/public/static/plugins/css/wallet/admin/walletadmin.css b/public/static/plugins/css/wallet/admin/wallet.css
similarity index 100%
rename from public/static/plugins/css/wallet/admin/walletadmin.css
rename to public/static/plugins/css/wallet/admin/wallet.css