edit

src/cate/api/Icon.php → src/cate/app/Api/Icon.php

@@ -12,7 +12,7 @@ class Icon
         }
         $list = [];
         if ($id) {
-            $info = Dever::db('icon', 'cate')->find($id);
+            $info = Dever::db('cate/icon')->find($id);
             if ($info) {
                 $this->getSvg($info);
                 $info['class'] = 'show-selector-active';
@@ -20,7 +20,7 @@ class Icon
             }
         }
         $set['num'] = 12;
-        $data = Dever::db('icon', 'cate')->select($where, $set);
+        $data = Dever::db('cate/icon')->select($where, $set);
         foreach ($data as $k => $v) {
             if ($id && $v['id'] == $id) {
                 continue;

src/cate/api/Info.php → src/cate/app/Api/Info.php

@@ -50,7 +50,7 @@ class Info
             $data['top_id'] = $top_id;
             $data['parent'] = $data['top_id'] . ',' . $data['parent_id'];
         }
-        $icon = Dever::load('icon', 'cate')->get($data['name']);
+        $icon = Dever::load(\Cate\Lib\Icon::class)->get($data['name']);
         if ($icon) {
             $data['icon_id'] = $icon['id'];
         }

src/cate/lib/Icon.php → src/cate/app/Lib/Icon.php

@@ -10,7 +10,7 @@ class Icon
     public function get($name, $method = 'find')
     {
         $where['search_name'] = $name;
-        $info = Dever::db('icon', 'cate')->$method($where);
+        $info = Dever::db('cate/icon')->$method($where);
         if (!$info) {
             $url = 'https://www.iconfont.cn/api/icon/search.json';
             if (strstr($name, '（')) {
@@ -41,15 +41,15 @@ class Icon
                     $up = $where;
                     $up['name'] = $v['name'];
                     $up['svg'] = $v['show_svg'];
-                    $state = Dever::db('icon', 'cate')->insert($up);
+                    $state = Dever::db('cate/icon')->insert($up);
                     if (!$id) {
                         $id = $state;
                     }
                 }
                 if ($method == 'find') {
-                    $info = Dever::db('icon', 'cate')->$method($id);
+                    $info = Dever::db('cate/icon')->$method($id);
                 } else {
-                    $info = Dever::db('icon', 'cate')->$method($where);
+                    $info = Dever::db('cate/icon')->$method($where);
                 }
             }
         }
@@ -59,7 +59,7 @@ class Icon
     # 展示图标
     public function show($id)
     {
-        $info = Dever::db('icon', 'cate')->find($id);
+        $info = Dever::db('cate/icon')->find($id);
         if ($info) {
             $pattern = '/(width|height): [^;]+;/';
             $replacement = 'width: 30px; height: 30px;';

src/cate/lib/Info.php → src/cate/app/Lib/Info.php

@@ -5,11 +5,11 @@ class Info
     public function getManageList()
     {
         $where = ['status' => 1];
-        $parent = Dever::db('level_1', 'cate')->select($where);
+        $parent = Dever::db('cate/level_1')->select($where);
         $result = [];
         foreach ($parent as $k => $v) {
             $where['parent_id'] = $v['id'];
-            $v['children'] = Dever::db('level_2', 'cate')->select($where);
+            $v['children'] = Dever::db('cate/level_2')->select($where);
             $result[] = $v;
         }
         return $result;

src/cate/index.php

@@ -1,5 +1,5 @@
 <?php
-define('DEVER_APP_NAME', 'cate');
+define('DEVER_APP_NAME', 'Cate');
 define('DEVER_APP_LANG', '分类');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../place/boot.php');

src/place/act/lib/Core.php → src/place/act/app/Lib/Core.php

@@ -1,32 +1,34 @@
-<?php namespace Place_act\Lib;
+<?php namespace Pact\Lib;
 use Dever;
-use Place;
 class Core
 {
     private $db;
     private $type;
     private $type_id;
+    private $uid;
     protected $data;
     public static $instance = [];
-    public static function load($name, $type = false, $type_id = false)
+    public static function load($name, $uid, $type = false, $type_id = false)
     {
-        if (empty(static::$instance[$name])) {
-            static::$instance[$name] = new self($name, $type, $type_id);
+        $key = $name . $uid;
+        if (empty(static::$instance[$key])) {
+            static::$instance[$key] = new self($key, $uid, $type, $type_id);
         }
-        return static::$instance[$name];
+        return static::$instance[$key];
     }
 
-    public function __construct($name, $type = false, $type_id = false)
+    public function __construct($name, $uid, $type = false, $type_id = false)
     {
+        $this->uid = $uid;
         $this->type = Dever::input('type', '', '', $type);
         $this->type_id = Dever::input('type_id', '', '', $type_id);
-        $this->db = Dever::db($name, 'place_act');
+        $this->db = Dever::db($name, 'Pact');
     }
 
     protected function check()
     {
         if (!$this->type || !$this->type_id) {
-            Dever::error('传入参数错误');
+            Dever::out()->error('传入参数错误');
         }
     }
 
@@ -39,7 +41,7 @@ class Core
             $state = $this->db->insert($this->data);
             if ($state) {
                 # 这里可以判断一下是否优质的评价 以后加
-                Dever::load('log', 'place_score')->action($this->db->config['name'])->add(Place::$uid);
+                Dever::load(\Pscore\Lib\Log::class)->action($this->db->config['name'])->add($this->uid);
             }
         }
         return 'ok';
@@ -52,7 +54,7 @@ class Core
         if ($info) {
             $state = $this->db->delete($info['id']);
             if ($state) {
-                Dever::load('log', 'place_score')->action('取消' . $this->db->config['name'])->add(Place::$uid);
+                Dever::load(\Pscore\Lib\Log::class)->action('取消' . $this->db->config['name'])->add($this->uid);
             }
         }
         return 'ok';
@@ -67,7 +69,7 @@ class Core
         }
         $this->data['type'] = $this->type;
         $this->data['type_id'] = $this->type_id;
-        $this->data['uid'] = Place::$uid;
+        $this->data['uid'] = $this->uid;
         $info = $this->db->find($this->data);
         if ($get) {
             return $this->handleInfo($info, $field);
@@ -88,7 +90,7 @@ class Core
                 $v['cdate_str'] = date('Y-m-d H:i:s', $v['cdate']);
                 unset($v['cdate']);
                 $v['oper'] = 2;
-                if (Place::$uid == $v['uid']) {
+                if ($this->uid == $v['uid']) {
                     $v['oper'] = 1;
                 }
                 if (isset($v['pic'])) {
@@ -101,7 +103,7 @@ class Core
                 if (isset($v['open']) && $v['open'] == 2) {
                     $v['user'] = ['name' => '匿名', 'avatar' => 'https://api.dicebear.com/7.x/thumbs/svg?seed=1'];
                 } else {
-                    $v['user'] = Dever::db('info', 'place_user')->find($v['uid'], ['col' => 'name,avatar']);
+                    $v['user'] = Dever::db('puser/info')->find($v['uid'], ['col' => 'name,avatar']);
                 }
             }
         }
@@ -120,7 +122,7 @@ class Core
     # 获取用户的互动列表
     public function getUserList($field = [], $page = 10)
     {
-        $where['uid'] = Place::$uid;
+        $where['uid'] = $this->uid;
         if ($this->type) {
             $where['type'] = $this->type;
         }

src/place/act/index.php

@@ -1,5 +1,5 @@
 <?php
-define('DEVER_APP_NAME', 'place_act');
+define('DEVER_APP_NAME', 'Pact');
 define('DEVER_APP_LANG', '品牌互动');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/act/table/collect.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '收藏',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'uid'       => [
             'type'      => 'int(11)',

src/place/act/table/like.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '点赞',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'uid'       => [
             'type'      => 'int(11)',

src/place/act/table/review.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '评价',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc',
     'struct' => [
         'type'        => [

src/place/benefit/lib/Code.php → src/place/benefit/app/Lib/Code.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib;
+<?php namespace Pbenefit\Lib;
 use Dever;
 class Code
 {
@@ -6,7 +6,7 @@ class Code
     public function create($type, $prefix, $length)
     {
         $code = $prefix . \Dever\Helper\Str::rand($length, $type-1);
-        $check = Dever::db('perk_code', 'place_benefit')->find(['code' => $code]);
+        $check = Dever::db('pbenefit/perk_code')->find(['code' => $code]);
         if (!$check) {
             return $code;
         }

src/place/benefit/lib/Item.php → src/place/benefit/app/Lib/Item.php

@@ -1,11 +1,11 @@
-<?php namespace Place_benefit\Lib;
+<?php namespace Pbenefit\Lib;
 use Dever;
 class Item
 {
     # 载入某个权益
     public function load($name)
     {
-        return Dever::load('item/' . $name, 'place_benefit');
+        return Dever::load('\\Pbenefit\Lib\\Item\\' . ucfirst($name))
     }
 
     # 直接获取权益数据
@@ -13,14 +13,14 @@ class Item
     {
         $result = [];
         $where['status'] = 1;
-        $data = Dever::db($type, 'place_benefit')->select($where, $set);
+        $data = Dever::db('pbenefit/' . $type)->select($where, $set);
         if ($data) {
             if ($scope) {
                 foreach ($data as $info) {
-                    $list = Dever::db('scope', 'place_benefit')->select(['type' => $type, 'type_id' => $info['id']]);
+                    $list = Dever::db('pbenefit/scope')->select(['type' => $type, 'type_id' => $info['id']]);
                     if ($list) {
                         foreach ($list as $v1) {
-                            $state = Dever::load('scope', 'place_benefit')->valid($scope, $v1['value'], $v1['ids']);
+                            $state = Dever::load(\Pbenefit\Lib\Scope::class)->valid($scope, $v1['value'], $v1['ids']);
                             if ($state) {
                                 $result[] = $info;
                             }
@@ -90,11 +90,11 @@ class Item
         switch ($type) {
             # 积分数值
             case 'score_num':
-                $result = Dever::db('info', 'place_score')->$method($where);
+                $result = Dever::db('pscore/info')->$method($where);
                 break;
 
             default:
-                $result = Dever::db($type, 'place_benefit')->$method($where);
+                $result = Dever::db('pbenefit/' . $type)->$method($where);
         }
         if ($type_id && $desc) {
             # 解析出描述
@@ -103,7 +103,7 @@ class Item
             }
             $result['config_type'] = $type;
             $result['config_type_id'] = $type_id;
-            $result = Dever::load('item/' . $type, 'place_benefit')->getDesc($result);
+            $result = $this->load($type)->getDesc($result);
         }
         return $result;
     }
@@ -132,7 +132,7 @@ class Item
     public function getNumDesc($type, $type_id, $num)
     {
         if ($type == 'score_num') {
-            $result = Dever::load('info', 'place_score')->getText($num, $type_id);
+            $result = Dever::load(\Pscore\Lib\Info::class)->getText($num, $type_id);
         } else {
             $result = floor($num);
             if ($type == 'coupon' || $type == 'gift' || $type == 'perk' || $type == 'held') {

src/place/benefit/lib/Item/Bonus.php → src/place/benefit/app/Lib/Item/Bonus.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 分红
 class Bonus
@@ -9,11 +9,11 @@ class Bonus
         if ($price <= 0) {
             return false;
         }
-        $data = Dever::load('user', 'place_benefit')->getValid($uid, 'rebate', $scope);
+        $data = Dever::load(\Pbenefit\Lib\User::class)->getValid($uid, 'rebate', $scope);
         if ($data) {
             $result = ['rule' => $rule, 'buy' => ['name' => '购买立返', 'desc' => []], 'share' => ['name' => '分享可赚', 'desc' => []]];
             foreach ($data as $info) {
-                $rule = Dever::db('rebate_rule', 'place_benefit')->select(['rebate_id' => $info['id']], ['col' => 'id,value,`condition`,level,score_id']);
+                $rule = Dever::db('pbenefit/rebate_rule')->select(['rebate_id' => $info['id']], ['col' => 'id,value,`condition`,level,score_id']);
                 foreach ($rule as $k => $v) {
                     if (!$v['value']) {
                         continue;
@@ -24,11 +24,11 @@ class Bonus
                     $v['source_value'] = $v['value'];
                     $v['value'] = Dever::math('value', $price, $v['value']);
                     if ($v['value'] > 0) {
-                        $score = Dever::load('info', 'place_score')->get($v['score_id']);
+                        $score = Dever::load(\Pscore\Lib\Info::class)->get($v['score_id']);
                         if (isset($result['rule'][$v['id']])) {
                             $v['value'] += $result['rule'][$v['id']]['value'];
                         }
-                        $v['value_text'] = Dever::load('info', 'place_score')->getText($v['value'], $score);
+                        $v['value_text'] = Dever::load(\Pscore\Lib\Info::class)->getText($v['value'], $score);
                         $v['rebate_id'] = $info['id'];
                         $v['name'] = $info['name'];
                         $result['rule'][$v['id']] = $v;
@@ -54,7 +54,7 @@ class Bonus
         for ($i = 1; $i <= 3; $i++) {
             $str = 'child_num_' . $i;
             if (strstr($condition, $str)) {
-                $child = Dever::load('relation', 'invite')->getChildNum($uid, $i);
+                $child = Dever::load(\Invite\Lib\Relation::class)->getChildNum($uid, $i);
                 $condition = str_replace($str, $child, $condition);
             }
         }
@@ -66,19 +66,19 @@ class Bonus
     # 获取描述信息
     public function getDesc($info)
     {
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'bonus');
-        $info['type_name'] = Dever::db('bonus', 'place_benefit')->value('type', $info['type']);
-        $info['give_source_name'] = Dever::db('bonus', 'place_benefit')->value('give_source', $info['give_source']);
-        $info['period_name'] = Dever::db('bonus', 'place_benefit')->value('period', $info['period']);
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'bonus');
+        $info['type_name'] = Dever::db('pbenefit/bonus')->value('type', $info['type']);
+        $info['give_source_name'] = Dever::db('pbenefit/bonus')->value('give_source', $info['give_source']);
+        $info['period_name'] = Dever::db('pbenefit/bonus')->value('period', $info['period']);
         if ($info['period'] == 1) {
             $info['desc'] = $info['period_name'] . $info['period_day'] . '点';
         } else {
             $info['desc'] = $info['period_name'] . '1点';
         }
         $info['desc'] .= '，发放';
-        $score = Dever::load('info', 'place_score')->get($info['give_score_id']);
+        $score = Dever::load(\Pscore\Lib\Info::class)->get($info['give_score_id']);
         if (!strstr($info['give_value'], '%')) {
-            $info['value_text'] = Dever::load('info', 'place_score')->getText($info['give_value'], $score);
+            $info['value_text'] = Dever::load(\Pscore\Lib\Info::class)->getText($info['give_value'], $score);
             $info['desc'] .= $info['value_text'];
             $info['tip'] = '';
         } else {
@@ -89,13 +89,13 @@ class Bonus
                 $info['give_source_name'] = '本人';
             }
             if ($info['type'] == 2) {
-                $holding = Dever::load('info', 'place_score')->get($info['holding_score_id']);
+                $holding = Dever::load(\Pscore\Lib\Info::class)->get($info['holding_score_id']);
                 $info['type_name'] .= $holding['name'];
             }
             $money = '（转人民币后的总额）';
             $info['desc'] .= $info['give_source_name'] . $info['type_name'] . '总额'.$money.'的' . $info['give_value'] . $score['name'];
         }
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         if (isset($info['config_day'])) {
             $info['tname'] = true;
         }

src/place/benefit/lib/Item/Buy.php → src/place/benefit/app/Lib/Item/Buy.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 购买限额
 class Buy
@@ -12,7 +12,7 @@ class Buy
     # 获取描述信息
     public function getDesc($info)
     {
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'visit');
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'visit');
         $info['desc'] = $info['day'] . '天内';
         if ($info['value'] > 0) {
             $info['desc'] .= '最多购买' . $info['value'] . '次';
@@ -23,7 +23,7 @@ class Buy
             }
             $info['desc'] .= '每次购买' . $info['value'] . '个';
         }
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         return $info;
     }
 }

src/place/benefit/lib/Item/Coupon.php → src/place/benefit/app/Lib/Item/Coupon.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 优惠券
 class Coupon
@@ -6,8 +6,8 @@ class Coupon
     # 获取基本信息
     public function getInfo($info, $score = [])
     {
-        $scoreInfo = Dever::load('info', 'place_score');
-        $info['type_name'] = Dever::db('coupon', 'place_benefit')->value('type', $info['type']) . '券';
+        $scoreInfo = Dever::load(\Pscore\Lib\Info::class);
+        $info['type_name'] = Dever::db('pbenefit/coupon')->value('type', $info['type']) . '券';
         if (isset($info['sdate'])) {
             $info['date_name'] = date('Y.m.d H:i', $info['sdate']) . '~'. date('Y.m.d H:i', $info['edate']);
             unset($info['sdate']);
@@ -27,7 +27,7 @@ class Coupon
                 $info['value_text'] = $scoreInfo->getText($info['value'], $score);
             }
         } elseif (empty($info['value_text'])) {
-            $money = \Place::money();
+            $money = Dever::load(\Place\Lib\Info::class)->money();
             $info['min_text'] = $info['min'] . $money['unit'];
             if ($info['type'] <= 2) {
                 $info['value_text'] = $info['value'] . $money['unit'];
@@ -60,13 +60,13 @@ class Coupon
     # 获取描述信息
     public function getDesc($info)
     {
-        $money = \Place::money();
+        $money = Dever::load(\Place\Lib\Info::class)->money();
         $info['min_text'] = $info['min'] . $money['unit'];
         $info['value_text'] = $info['value'] . $money['unit'];
         $info['desc'] = $this->getTitle($info);
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'coupon');
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
-        $info['config_name'] = Dever::db('coupon', 'place_benefit')->value('type', $info['type']) . '券';
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'coupon');
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
+        $info['config_name'] = Dever::db('pbenefit/coupon')->value('type', $info['type']) . '券';
         return $info;
     }
 }

src/place/benefit/lib/Item/Exchange.php → src/place/benefit/app/Lib/Item/Exchange.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 兑换
 class Exchange
@@ -12,8 +12,8 @@ class Exchange
     # 获取描述信息
     public function getDesc($info)
     {
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'exchange');
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'exchange');
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         return $info;
     }
 }

src/place/benefit/lib/Item/Gift.php → src/place/benefit/app/Lib/Item/Gift.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 礼品卡
 class Gift
@@ -24,13 +24,13 @@ class Gift
         $info['title'] = '';
         if ($score) {
             if ($info['min'] > 0) {
-                $info['min'] = Dever::load('info', 'place_score')->toScore($info['min'], $score['exp']);
-                $info['min_text'] = Dever::load('info', 'place_score')->getText($info['min'], $score);
+                $info['min'] = Dever::load(\Pscore\Lib\Info::class)->toScore($info['min'], $score['exp']);
+                $info['min_text'] = Dever::load(\Pscore\Lib\Info::class)->getText($info['min'], $score);
             }
-            $info['value'] = Dever::load('info', 'place_score')->toScore($info['value'], $score['exp']);
-            $info['value_text'] = Dever::load('info', 'place_score')->getText($info['value'], $score);
+            $info['value'] = Dever::load(\Pscore\Lib\Info::class)->toScore($info['value'], $score['exp']);
+            $info['value_text'] = Dever::load(\Pscore\Lib\Info::class)->getText($info['value'], $score);
         } elseif (empty($info['value_text'])) {
-            $money = \Place::money();
+            $money = Dever::load(\Place\Lib\Info::class)->money();
             $info['min_text'] = $info['min'] . $money['unit'];
             $info['value_text'] = $info['value'] . $money['unit'];
             $info['yue_text'] = $info['yue'] . $money['unit'];
@@ -45,10 +45,10 @@ class Gift
     # 获取描述信息
     public function getDesc($info)
     {
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'gift');
-        $money = \Place::money();
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'gift');
+        $money = Dever::load(\Place\Lib\Info::class)->money();
         $info['desc'] = '面值：' . $info['value'] . $money['unit'];
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         return $info;
     }
 }

src/place/benefit/lib/Item/Held.php → src/place/benefit/app/Lib/Item/Held.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 持有权
 class Held
@@ -12,7 +12,7 @@ class Held
     # 获取描述信息
     public function getDesc($info)
     {
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         return $info;
     }
 }

src/place/benefit/lib/Item/Perk.php → src/place/benefit/app/Lib/Item/Perk.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 权益包
 class Perk
@@ -17,7 +17,7 @@ class Perk
         }
         # 共有多少权益
         $where = ['perk_code_id' => $info['perk_code_id'], 'status' => 1];
-        $info['yue'] = Dever::db('perk_code_item', 'place_benefit')->count($where);
+        $info['yue'] = Dever::db('pbenefit/perk_code_item')->count($where);
         $info = $this->getDesc($info);
         return $info;
     }
@@ -27,13 +27,13 @@ class Perk
     {
         $info['tip'] = $info['desc'];
         if (isset($info['config_type_id'])) {
-            $voucher = Dever::db('perk_voucher', 'place_benefit')->select(['perk_id' => $info['config_type_id']]);
+            $voucher = Dever::db('pbenefit/perk_voucher')->select(['perk_id' => $info['config_type_id']]);
             if ($voucher) {
                 $info['tip'] .= '<table style="width:100%; border-collapse:collapse; text-align:left; table-layout:auto;">';
                 $info['tip'] .= '<tr><td style="border:1px solid #ddd; padding:8px;">权益名称</td><td style="border:1px solid #ddd; padding:8px;">权益数量</td></tr>';
                 foreach ($voucher as $v) {
-                    $item = Dever::load('item', 'place_benefit')->getTypeData($v['type'], $v['type_id']);
-                    $v['num'] = Dever::load('item', 'place_benefit')->getNumDesc($v['type'], $v['type_id'], $v['num']);
+                    $item = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($v['type'], $v['type_id']);
+                    $v['num'] = Dever::load(\Pbenefit\Lib\Item::class)->getNumDesc($v['type'], $v['type_id'], $v['num']);
                     $info['tip'] .= '<tr><td style="border:1px solid #ddd; padding:8px;">'.$item['name'].'</td><td style="border:1px solid #ddd; padding:8px;">'.$v['num'].'</td></tr>';
                 }
                 $info['tip'] .= '</table>';
@@ -42,7 +42,7 @@ class Perk
         } else {
             $info['title'] = '权益包介绍';
         }
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         return $info;
     }
 
@@ -50,10 +50,10 @@ class Perk
     public function getData($code_id, $edate)
     {
         $result = [];
-        $data = Dever::db('perk_code_item', 'place_benefit')->select(['perk_code_id' => $code_id]);
+        $data = Dever::db('pbenefit/perk_code_item')->select(['perk_code_id' => $code_id]);
         if ($data) {
             $edate = '领取有效期' . date('Y-m-d H:i', $edate);
-            $config = Dever::load('item', 'place_benefit')->getType(2, true);
+            $config = Dever::load(\Pbenefit\Lib\Item::class)->getType(2, true);
             //$desc['config_day'] = 0;
             $desc['config_max'] = 0;
             foreach ($data as $v) {
@@ -61,7 +61,7 @@ class Perk
                     $v['yue'] = $v['total'] - $v['received'];
                     if ($v['yue'] > 0) {
                         $desc['config_num'] = $v['yue'];
-                        $info = Dever::load('item', 'place_benefit')->getTypeData($v['type'], $v['type_id'], $desc);
+                        $info = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($v['type'], $v['type_id'], $desc);
                         if ($info) {
                             if (isset($info['tname']) && $info['tname']) {
                                 $info['tname'] = '次卡';
@@ -72,7 +72,7 @@ class Perk
                             $v['yue'] = $desc['config_num'];
                             $v['name'] = $info['name'];
                             $v['desc'] = $info['desc'];
-                            $v['type_name'] = Dever::load('item', 'place_benefit')->getNumDesc($v['type'], $v['type_id'], $v['yue']);
+                            $v['type_name'] = Dever::load(\Pbenefit\Lib\Item::class)->getNumDesc($v['type'], $v['type_id'], $v['yue']);
                             if (isset($info['config_name'])) {
                                 $v['config_name'] = $info['config_name'] . $info['tname'];
                             } else {
@@ -98,19 +98,19 @@ class Perk
         if (!$num) {
             $num = 1;
         }
-        $perk = Dever::db('perk', 'place_benefit')->find($id);
+        $perk = Dever::db('pbenefit/perk')->find($id);
         $up['perk_id'] = $id;
         $up['total'] = $total;
         $up['utype'] = $utype;
         $up['uid'] = $uid;
         $result = [];
         for ($i = 1; $i <= $num; $i++) {
-            $up['code'] = Dever::load('code', 'place_benefit')->create($perk['code_type'], $perk['code_prefix'], $perk['code_length']);
-            Dever::db('perk_code', 'place_benefit')->insert($up);
+            $up['code'] = Dever::load('code', 'Pbenefit')->create($perk['code_type'], $perk['code_prefix'], $perk['code_length']);
+            Dever::db('pbenefit/perk_code')->insert($up);
             $result[] = $up['code'];
         }
-        $total = Dever::db('perk_code', 'place_benefit')->count(['perk_id' => $id]);
-        Dever::db('perk', 'place_benefit')->update($id, ['total' => $total]);
+        $total = Dever::db('pbenefit/perk_code')->count(['perk_id' => $id]);
+        Dever::db('pbenefit/perk')->update($id, ['total' => $total]);
         return implode('、', $result);
     }
 }

src/place/benefit/lib/Item/Promotion.php → src/place/benefit/app/Lib/Item/Promotion.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 促销
 class Promotion
@@ -6,7 +6,7 @@ class Promotion
     # 获取用户的促销信息
     public function get($uid, $scope, $price, $exp)
     {
-        $data = Dever::load('user', 'place_benefit')->getValid($uid, 'promotion', $scope);
+        $data = Dever::load(\Pbenefit\Lib\User::class)->getValid($uid, 'promotion', $scope);
         if ($data) {
             # 获取最低价格
             $info = [];
@@ -26,7 +26,7 @@ class Promotion
                     $r['value'] .= '%';
                 } elseif ($r['type'] == 3) {
                     # 数值
-                    $r['price'] = Dever::load('info', 'place_score')->toScore($r['value'], $exp);
+                    $r['price'] = Dever::load(\Pscore\Lib\Info::class)->toScore($r['value'], $exp);
                 }
                 if (!$info) {
                     $info = $r;
@@ -43,7 +43,7 @@ class Promotion
     # 获取展示标签的促销信息
     public function getInfoByTag($scope)
     {
-        $data = Dever::load('item', 'place_benefit')->getList('promotion', $scope, ['tag' => 1], ['col' => 'id,name,tag_name']);
+        $data = Dever::load(\Pbenefit\Lib\Item::class)->getList('promotion', $scope, ['tag' => 1], ['col' => 'id,name,tag_name']);
         if ($data) {
             if ($data[0]['tag_name']) {
                 $data[0]['name'] = $data[0]['tag_name'];
@@ -56,7 +56,7 @@ class Promotion
     # 获取描述信息
     public function getDesc($info)
     {
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'promotion');
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'promotion');
         $info['desc'] = '';
         if ($info['type'] == 1) {
             # 折扣
@@ -66,10 +66,10 @@ class Promotion
             $info['desc'] .= $info['value'] . '%';
         } elseif ($info['type'] == 3) {
             # 数值
-            $money = \Place::money();
+            $money = Dever::load(\Place\Lib\Info::class)->money();
             $info['desc'] .= $info['value'] . $money['unit'];
         }
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         if (isset($info['config_day'])) {
             $info['tname'] = true;
         }

src/place/benefit/lib/Item/Rebate.php → src/place/benefit/app/Lib/Item/Rebate.php

@@ -1,5 +1,6 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
+use Place;
 # 返利
 class Rebate
 {
@@ -9,11 +10,11 @@ class Rebate
         if ($price <= 0) {
             return false;
         }
-        $data = Dever::load('user', 'place_benefit')->getValid($uid, 'rebate', $scope);
+        $data = Dever::load(\Pbenefit\Lib\User::class)->getValid($uid, 'rebate', $scope);
         if ($data) {
             $result = ['rule' => $rule, 'buy' => ['name' => '购买立返', 'desc' => []], 'share' => ['name' => '分享可赚', 'desc' => []]];
             foreach ($data as $info) {
-                $rule = Dever::db('rebate_rule', 'place_benefit')->select(['rebate_id' => $info['id']], ['col' => 'id,value,`condition`,level,score_id']);
+                $rule = Dever::db('pbenefit/rebate_rule')->select(['rebate_id' => $info['id']], ['col' => 'id,value,`condition`,level,score_id']);
                 foreach ($rule as $k => $v) {
                     if (!$v['value']) {
                         continue;
@@ -24,11 +25,11 @@ class Rebate
                     $v['source_value'] = $v['value'];
                     $v['value'] = Dever::math('value', $price, $v['value']);
                     if ($v['value'] > 0) {
-                        $score = Dever::load('info', 'place_score')->get($v['score_id']);
+                        $score = Dever::load(\Pscore\Lib\Info::class)->get($v['score_id']);
                         if (isset($result['rule'][$v['id']])) {
                             $v['value'] += $result['rule'][$v['id']]['value'];
                         }
-                        $v['value_text'] = Dever::load('info', 'place_score')->getText($v['value'], $score);
+                        $v['value_text'] = Dever::load(\Pscore\Lib\Info::class)->getText($v['value'], $score);
                         $v['rebate_id'] = $info['id'];
                         $v['name'] = $info['name'];
                         $result['rule'][$v['id']] = $v;
@@ -54,7 +55,7 @@ class Rebate
         for ($i = 1; $i <= 3; $i++) {
             $str = 'child_num_' . $i;
             if (strstr($condition, $str)) {
-                $child = Dever::load('relation', 'invite')->getChildNum($uid, $i);
+                $child = Dever::load(\Invite\Lib\Relation::class)->getChildNum($uid, $i);
                 $condition = str_replace($str, $child, $condition);
             }
         }
@@ -66,15 +67,15 @@ class Rebate
     # 获取描述信息
     public function getDesc($info)
     {
-        $uid = \Place::$uid;
+        $uid = Dever::load(Place::class)->uid;
         $info['desc'] = '';
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'rebate');
-        $rule = Dever::db('rebate_rule', 'place_benefit')->select(['rebate_id' => $info['id']], ['col' => 'id,value,`condition`,level,score_id']);
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'rebate');
+        $rule = Dever::db('pbenefit/rebate_rule')->select(['rebate_id' => $info['id']], ['col' => 'id,value,`condition`,level,score_id']);
         if ($rule) {
             $buy = [];
             $share = [];
             foreach ($rule as $k => $v) {
-                $v['value'] = Dever::load('info', 'place_score')->getText($v['value'], $v['score_id']);
+                $v['value'] = Dever::load(\Pscore\Lib\Info::class)->getText($v['value'], $v['score_id']);
                 if ($v['condition'] && !$this->check($uid, $v['condition'])) {
                     continue;
                 }
@@ -95,7 +96,7 @@ class Rebate
                 $info['desc'] .= '分享赚' . implode('+', $share);
             }
         }
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         if (isset($info['config_day'])) {
             $info['tname'] = true;
         }

src/place/benefit/lib/Item/Sales.php → src/place/benefit/app/Lib/Item/Sales.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 class Sales
 {
@@ -33,7 +33,7 @@ class Sales
     public function check($scope, $buy_scope, $buy_ids)
     {
         if ($scope) {
-            return Dever::load('scope', 'place_benefit')->valid($scope, $buy_scope, $buy_ids);
+            return Dever::load(\Pbenefit\Lib\Scope::class)->valid($scope, $buy_scope, $buy_ids);
         } else {
             return true;
         }

src/place/benefit/lib/Item/Score.php → src/place/benefit/app/Lib/Item/Score.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 积分规则
 class Score
@@ -7,7 +7,7 @@ class Score
     public function get($uid, $info)
     {
         $info['rule_id'] = 0;
-        $data = Dever::load('user', 'place_benefit')->getValid($uid, 'score');
+        $data = Dever::load(\Pbenefit\Lib\User::class)->getValid($uid, 'score');
         if ($data) {
             # 获取信息
             foreach ($data as $v) {
@@ -34,10 +34,10 @@ class Score
     # 获取充值规则列表
     public function getRechargeList($info)
     {
-        $data = Dever::db('score_recharge', 'place_benefit')->select(['score_id' => $info['rule_id']], ['col' => 'id,value,price']);
+        $data = Dever::db('pbenefit/score_recharge')->select(['score_id' => $info['rule_id']], ['col' => 'id,value,price']);
         if ($data) {
             foreach ($data as &$v) {
-                $v['value_text'] = Dever::load('info', 'place_score')->getText($v['value'], $info);
+                $v['value_text'] = Dever::load(\Pscore\Lib\Info::class)->getText($v['value'], $info);
             }
         }
         return $data;
@@ -50,7 +50,7 @@ class Score
             if (!$recharge_id) {
                 Dever::error('充值金额错误');
             }
-            $recharge = Dever::db('score_recharge', 'place_benefit')->find(['id' => $recharge_id, 'score_id' => $info['rule_id'], 'status' => 1]);
+            $recharge = Dever::db('pbenefit/score_recharge')->find(['id' => $recharge_id, 'score_id' => $info['rule_id'], 'status' => 1]);
             if (!$recharge) {
                 Dever::error('充值金额错误');
             }
@@ -59,7 +59,7 @@ class Score
             $info['recharge'] = ['id' => 0, 'value' => $number, 'price' => $number];
         }
         
-        $data = Dever::load('score/pay', 'place_order')->get([$info], ['score' => $info, 'rebate' => []], false);
+        $data = Dever::load(\Porder\Lib\Score\Pay::class)->get([$info], ['score' => $info, 'rebate' => []], false);
         return $data;
     }
 
@@ -67,16 +67,16 @@ class Score
     public function getExchangeList($info)
     {
         $result = array();
-        $data = Dever::db('score_exchange', 'place_benefit')->select(['score_id' => $info['rule_id']], ['col' => 'id,exchange_score_id,value']);
+        $data = Dever::db('pbenefit/score_exchange')->select(['score_id' => $info['rule_id']], ['col' => 'id,exchange_score_id,value']);
         if ($data) {
             foreach ($data as $v) {
                 if ($v['exchange_score_id'] != $info['id']) {
-                    $exchange = Dever::load('info', 'place_score')->get($v['exchange_score_id']);
+                    $exchange = Dever::load(\Pscore\Lib\Info::class)->get($v['exchange_score_id']);
                     $info['exp'] = $v['value'];
                     $v['name'] = $exchange['name'];
                     $v['symbol'] = $exchange['symbol'];
                     $v['symbol_location'] = $exchange['symbol_location'];
-                    $v['tip'] = Dever::load('info', 'place_score')->getExpTip($info, $exchange);
+                    $v['tip'] = Dever::load(\Pscore\Lib\Info::class)->getExpTip($info, $exchange);
                     $result[] = $v;
                 }
             }
@@ -87,7 +87,7 @@ class Score
     # 确认兑换
     public function exchange($info, $user, $id, $number)
     {
-        $exchange = Dever::db('score_exchange', 'place_benefit')->find(['id' => $id, 'score_id' => $info['rule_id']]);
+        $exchange = Dever::db('pbenefit/score_exchange')->find(['id' => $id, 'score_id' => $info['rule_id']]);
         if ($exchange) {
             if ($info['status'] == 2) {
                 Dever::error('积分已禁用');
@@ -95,7 +95,7 @@ class Score
             if ($exchange['exchange_score_id'] == $info['id']) {
                 Dever::error('源积分不能与目标积分相同');
             }
-            $exinfo = Dever::load('user', 'place_score')->get($user['uid'], $exchange['exchange_score_id']);
+            $exinfo = Dever::load(\Pscore\Lib\User::class)->get($user['uid'], $exchange['exchange_score_id']);
             if ($exinfo['status'] == 2) {
                 Dever::error('目标积分已禁用');
             }
@@ -105,8 +105,8 @@ class Score
                 Dever::error('余额不足');
             }
             $value = Dever::math('mul', $number, $exchange['value']);
-            Dever::load('log', 'place_score')->action('兑换', $info['id'])->add($user['uid'], '', -1*$number);
-            Dever::load('log', 'place_score')->action('兑换', $exchange['exchange_score_id'])->add($user['uid'], '', $value);
+            Dever::load(\Pscore\Lib\Log::class)->action('兑换', $info['id'])->add($user['uid'], '', -1*$number);
+            Dever::load(\Pscore\Lib\Log::class)->action('兑换', $exchange['exchange_score_id'])->add($user['uid'], '', $value);
             return 'ok';
         } else {
             Dever::error('兑换失败');

src/place/benefit/lib/Item/Score_num.php → src/place/benefit/app/Lib/Item/Score_num.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 积分数值
 class Score_num
@@ -12,7 +12,7 @@ class Score_num
     # 获取描述信息
     public function getDesc($info)
     {
-        $info['desc'] = Dever::load('item', 'place_benefit')->getPeriodDesc($info);
+        $info['desc'] = Dever::load(\Pbenefit\Lib\Item::class)->getPeriodDesc($info);
         $info['tip'] = '';
         return $info;
     }

src/place/benefit/lib/Item/Visit.php → src/place/benefit/app/Lib/Item/Visit.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib\Item;
+<?php namespace Pbenefit\Lib\Item;
 use Dever;
 # 访问限额
 class Visit
@@ -12,7 +12,7 @@ class Visit
     # 获取描述信息
     public function getDesc($info)
     {
-        $info = Dever::load('scope', 'place_benefit')->getInfo($info, 'visit');
+        $info = Dever::load(\Pbenefit\Lib\Scope::class)->getInfo($info, 'visit');
         $info['desc'] = $info['day'] . '天内最多访问' . $info['value'] . '次';
         return $info;
     }

src/place/benefit/lib/Scope.php → src/place/benefit/app/Lib/Scope.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib;
+<?php namespace Pbenefit\Lib;
 use Dever;
 class Scope
 {
@@ -6,7 +6,7 @@ class Scope
     public function check($source_type, $data, $type, $scope, $result)
     {
         foreach ($data as $k => $v) {
-            $info = Dever::db($type, 'place_benefit')->find($v['type_id']);
+            $info = Dever::db('pbenefit/'. $type)->find($v['type_id']);
             if ($info && $info['status'] == 1) {
                 $info['source_type'] = $source_type;
                 $info['source_id'] = $v['id'];
@@ -14,7 +14,7 @@ class Scope
                 $key = $type . '_' . $info['id'];
                 # 验证范围
                 if ($scope) {
-                    $list = Dever::db('scope', 'place_benefit')->select(['type' => $type, 'type_id' => $info['id']]);
+                    $list = Dever::db('pbenefit/scope')->select(['type' => $type, 'type_id' => $info['id']]);
                     if ($list) {
                         foreach ($list as $v1) {
                             $state = $this->valid($scope, $v1['value'], $v1['ids']);
@@ -58,9 +58,9 @@ class Scope
     public function getInfo($info, $type)
     {
         if ($type == 'exchange') {
-            $data = Dever::db($type . '_scope', 'place_benefit')->select([$type . '_id' => $info['id']]);
+            $data = Dever::db('pbenefit/' . $type . '_scope')->select([$type . '_id' => $info['id']]);
         } else {
-            $data = Dever::db('scope', 'place_benefit')->select(['type' => $type, 'type_id' => $info['id']]);
+            $data = Dever::db('pbenefit/scope')->select(['type' => $type, 'type_id' => $info['id']]);
         }
         $info['title'] = '可用范围';
         $info['tip'] = '全场可用';
@@ -83,10 +83,10 @@ class Scope
         $result = '';
         if ($type == 1) {
             if ($ids) {
-                $source = Dever::db('info', 'place_source')->columns(['id' => ['in', $ids]], 'name');
+                $source = Dever::db('psource/info')->columns(['id' => ['in', $ids]], 'name');
                 $result = implode('、', $source);
             } else {
-                $result = Dever::load('channel', 'place_source')->getName($scope);
+                $result = Dever::load(Psource\Lib\Channel::class)->getName($scope);
                 if (!$result) {
                     $result = '全部资源';
                 }
@@ -94,10 +94,10 @@ class Scope
             $unit = '个';
         } elseif ($type == 2) {
             if ($ids) {
-                $source = Dever::db('level', 'place_role')->columns(['id' => ['in', $ids]], 'name');
+                $source = Dever::db('prole/level')->columns(['id' => ['in', $ids]], 'name');
                 $result = implode('、', $source);
             } else {
-                $result = Dever::load('info', 'place_role')->getName($scope);
+                $result = Dever::load(\Prole\Lib\Info::class)->getName($scope);
                 if (!$result) {
                     $result = '全部身份';
                 }

src/place/benefit/lib/User.php → src/place/benefit/app/Lib/User.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Lib;
+<?php namespace Pbenefit\Lib;
 use Dever;
 class User
 {
@@ -7,22 +7,22 @@ class User
     {
         $result = [];
         # 先验证用户是否有该权益
-        $user = Dever::db('user', 'place_benefit')->select(['uid' => $uid, 'type' => $type, 'status' => 1]);
+        $user = Dever::db('pbenefit/user')->select(['uid' => $uid, 'type' => $type, 'status' => 1]);
         if ($user) {
-            $result = Dever::load('scope', 'place_benefit')->check(1, $user, $type, $scope, $result);
+            $result = Dever::load(\Pbenefit\Lib\Scope::class)->check(1, $user, $type, $scope, $result);
         }
         # 再验证身份等级是否有该权益
-        $level = Dever::load('role', 'place_user')->getLevel($uid);
+        $level = Dever::load(\Puser\Lib\Role::class)->getLevel($uid);
         if (!$level) {
             # 如果当前用户没有任何身份等级，需要给一个默认的
-            $user = Dever::db('info', 'place_user')->find($uid);
-            Dever::load('info', 'place_role')->up($uid, $user['sales_type'], $user['sales_id']);
-            $level = Dever::load('role', 'place_user')->getLevel($uid);
+            $user = Dever::db('puser/info')->find($uid);
+            Dever::load(\Prole\Lib\Info::class)->up($uid, $user['sales_type'], $user['sales_id']);
+            $level = Dever::load(\Puser\Lib\Role::class)->getLevel($uid);
         }
         if ($level) {
-            $role = Dever::db('role_upgrade', 'place_benefit')->select(['type' => $type, 'level_id' => ['in', $level]]);
+            $role = Dever::db('pbenefit/role_upgrade')->select(['type' => $type, 'level_id' => ['in', $level]]);
             if ($role) {
-                $result = Dever::load('scope', 'place_benefit')->check(2, $role, $type, $scope, $result);
+                $result = Dever::load(\Pbenefit\Lib\Scope::class)->check(2, $role, $type, $scope, $result);
             }
         }
         return $result;
@@ -32,17 +32,17 @@ class User
     public function getList($uid)
     {
         $result = [];
-        $config = Dever::load('item', 'place_benefit')->getType(2, true);
+        $config = Dever::load(\Pbenefit\Lib\Item::class)->getType(2, true);
         # 我的权益
-        $user = Dever::db('user', 'place_benefit')->select(['uid' => $uid]);
+        $user = Dever::db('pbenefit/user')->select(['uid' => $uid]);
         # 固定权益
-        $level = Dever::load('role', 'place_user')->getLevel($uid);
+        $level = Dever::load(\Puser\Lib\Role::class)->getLevel($uid);
         if ($level) {
-            $user = array_merge($user, Dever::db('role_upgrade', 'place_benefit')->select(['level_id' => ['in', $level]]));
+            $user = array_merge($user, Dever::db('pbenefit/role_upgrade')->select(['level_id' => ['in', $level]]));
         }
         if ($user) {
             foreach ($user as $v) {
-                $info = Dever::load('item', 'place_benefit')->getTypeData($v['type'], $v['type_id'], true);
+                $info = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($v['type'], $v['type_id'], true);
                 if ($info) {
                     if (empty($info['config_name'])) {
                         $info['config_name'] = $config[$v['type']];
@@ -51,7 +51,7 @@ class User
                         $info = $this->getEdate($uid, $v['level_id'], $info);
                     } else {
                         $info['config_user_id'] = $v['id'];
-                        $info['type_name'] = Dever::load('item', 'place_benefit')->getNumDesc($v['type'], $v['type_id'], $v['num']);
+                        $info['type_name'] = Dever::load(\Pbenefit\Lib\Item::class)->getNumDesc($v['type'], $v['type_id'], $v['num']);
                         $info['edate'] = date('Y-m-d H:i', $v['cdate']) . '领取';
                         $info['receive_tip'] = $this->getLog($uid, 1, $v['id'], $v['type'], $v['type_id']);
 
@@ -71,16 +71,16 @@ class User
     public function getReceive($uid)
     {
         $result = [];
-        $config = Dever::load('item', 'place_benefit')->getType(2, true);
+        $config = Dever::load(\Pbenefit\Lib\Item::class)->getType(2, true);
         # 周期权益
-        $level = Dever::load('role', 'place_user')->getLevel($uid);
-        $period = Dever::db('role_period', 'place_benefit')->select(['level_id' => ['in', $level]]);
+        $level = Dever::load(\Puser\Lib\Role::class)->getLevel($uid);
+        $period = Dever::db('pbenefit/role_period')->select(['level_id' => ['in', $level]]);
         if ($period) {
             foreach ($period as $v) {
                 $desc['config_day'] = $v['day'];
                 $desc['config_num'] = $v['num'];
                 $desc['config_max'] = $v['max'];
-                $info = Dever::load('item', 'place_benefit')->getTypeData($v['type'], $v['type_id'], $desc);
+                $info = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($v['type'], $v['type_id'], $desc);
                 if ($info) {
                     if (isset($info['tname']) && $info['tname']) {
                         $info['tname'] = '次卡';
@@ -121,7 +121,7 @@ class User
         $where['source_id'] = $source_id;
         # 检测是否达到最大次数
         if ($max > 0) {
-            $count = Dever::db('user_log', 'place_benefit')->count($where);
+            $count = Dever::db('pbenefit/user_log')->count($where);
             if ($count >= $max) {
                 return '您已领取' . $count. '次，无法再次领取';
             }
@@ -129,7 +129,7 @@ class User
         # 每隔多少天发放一次奖励
         if ($day > 0) {
             $now = time();
-            $info = Dever::db('user_log', 'place_benefit')->find($where);
+            $info = Dever::db('pbenefit/user_log')->find($where);
             if ($info) {
                 $cur = $now - $info['cdate'];
                 $cur = floor($cur / 86400);
@@ -154,7 +154,7 @@ class User
             $where['source_id'] = $source_id;
         }
         
-        $log = Dever::db('user_log', 'place_benefit')->select($where);
+        $log = Dever::db('pbenefit/user_log')->select($where);
         $result = '';
         if ($log) {
             $name = '领取明细';
@@ -169,7 +169,7 @@ class User
                 if ($v['content']) {
                     $v['num'] = '<a data-content="'.$v['content'].'">' . $v['content'] . '</a>';
                 } else {
-                    $v['num'] = Dever::load('item', 'place_benefit')->getNumDesc($v['type'], $v['type_id'], $v['num']);
+                    $v['num'] = Dever::load(\Pbenefit\Lib\Item::class)->getNumDesc($v['type'], $v['type_id'], $v['num']);
                 }
                 $result .= '<tr><td style="border:1px solid #ddd; padding:8px;">'.$v['cdate'].'</td><td style="border:1px solid #ddd; padding:8px;">'.$v['num'].'</td></tr>';
             }
@@ -184,10 +184,10 @@ class User
     public function receive_commit(){}
     public function receive($uid, $info, $source = 1, $state = false)
     {
-        $level = Dever::load('role', 'place_user')->getLevel($uid);
+        $level = Dever::load(\Puser\Lib\Role::class)->getLevel($uid);
         if ($source == 1) {
             if (is_numeric($info)) {
-                $info = Dever::db('role_period', 'place_benefit')->find(['id' => $info, 'level_id' => ['in', $level]]);
+                $info = Dever::db('pbenefit/role_period')->find(['id' => $info, 'level_id' => ['in', $level]]);
             }
             $check = $this->check($uid, $source, $info['id'], $info['day'], $info['max']);
             if ($check) {
@@ -196,7 +196,7 @@ class User
                 }
                 Dever::error('未达到领取条件');
             }
-            $level = Dever::db('level', 'place_role')->find($info['level_id']);
+            $level = Dever::db('prole/level')->find($info['level_id']);
             $msg = $level['name'] . '权益';
         } elseif ($source == 2) {
             # 权益包
@@ -218,40 +218,40 @@ class User
             'type' => $info['type'],
             'type_id' => $info['type_id'],
         ];
-        $user = Dever::db('user', 'place_benefit')->find($log);
+        $user = Dever::db('pbenefit/user')->find($log);
         if (!$user) {
             $log['num'] = $info['num'];
-            $user_id = Dever::db('user', 'place_benefit')->insert($log);
+            $user_id = Dever::db('pbenefit/user')->insert($log);
         } else {
             $log['num'] = ['+', $info['num']];
             $user_id = $user['id'];
             $log['cdate'] = time();
-            Dever::db('user', 'place_benefit')->update($user_id, $log);
+            Dever::db('pbenefit/user')->update($user_id, $log);
         }
         $log['num'] = $info['num'];
         $log['user_id'] = $user_id;
         $log['source'] = $source;
         $log['source_id'] = $info['id'];
-        $state = Dever::db('user_log', 'place_benefit')->insert($log);
+        $state = Dever::db('pbenefit/user_log')->insert($log);
         if ($state) {
             if ($info['type'] == 'score_num') {
                 # 发积分
-                Dever::load('log', 'place_score')->action('奖励积分', $info['type_id'])->add($uid, $msg, $info['num']);
+                Dever::load(\Pscore\Lib\Log::class)->action('奖励积分', $info['type_id'])->add($uid, $msg, $info['num']);
             } elseif($info['type'] == 'coupon') {
                 # 发优惠券
                 for ($i = 1; $i <= $info['num']; $i++) {
-                    Dever::load('coupon', 'place_user')->receive($uid, $info['type_id'], false);
+                    Dever::load(\Puser\Lib\Coupon::class)->receive($uid, $info['type_id'], false);
                 }
             } elseif($info['type'] == 'gift') {
                 # 发礼品卡
                 for ($i = 1; $i <= $info['num']; $i++) {
-                    Dever::load('gift', 'place_user')->receive($uid, $info['type_id'], false);
+                    Dever::load(\Puser\Lib\Gift::class)->receive($uid, $info['type_id'], false);
                 }
             } elseif($info['type'] == 'perk') {
                 # 发放权益包兑换码
-                $content = Dever::load('item', 'place_benefit')->load('perk')->createCode(1, $uid, $info['type_id'], $info['num']);
+                $content = Dever::load(\Pbenefit\Lib\Item::class)->load('perk')->createCode(1, $uid, $info['type_id'], $info['num']);
                 if ($content) {
-                    Dever::db('user_log', 'place_benefit')->update($state, ['content' => $content]);
+                    Dever::db('pbenefit/user_log')->update($state, ['content' => $content]);
                 } else {
                     if ($state) {
                         return;
@@ -266,8 +266,8 @@ class User
     # 获取有效期
     public function getEdate($uid, $level_id, $info)
     {
-        $level = Dever::db('level', 'place_role')->find($level_id);
-        $user = Dever::db('user', 'place_role')->find(['uid' => $uid, 'info_id' => $level['info_id'], 'level_id' => $level['id']]);
+        $level = Dever::db('prole/level')->find($level_id);
+        $user = Dever::db('prole/user')->find(['uid' => $uid, 'info_id' => $level['info_id'], 'level_id' => $level['id']]);
         $info['type_name'] = $level['name'];
         $info['edate'] = '有效期至' . date('Y-m-d H:i', $user['edate']);
         return $info;

src/place/benefit/index.php

@@ -1,5 +1,5 @@
 <?php
-define('DEVER_APP_NAME', 'place_benefit');
+define('DEVER_APP_NAME', 'Pbenefit');
 define('DEVER_APP_LANG', '运营');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/benefit/manage/Lib/Api.php → src/place/benefit/manage/Api/Main.php

@@ -1,13 +1,13 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Api;
 use Dever;
-class Api
+class Main
 {
     # 获取权益类型
     public function getType($value)
     {
         $result = [];
         $result['type_id']['value'] = '';
-        $result['type_id']['option'] = Dever::load('item', 'place_benefit')->getTypeData($value);
+        $result['type_id']['option'] = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($value);
         return $result;
     }
 
@@ -27,9 +27,9 @@ class Api
                 } elseif (isset($value[1]) && $value[1]) {
                     $where['channel_id'] = $value[1];
                 }
-                $result[$key]['option'] = Dever::db('info', 'place_source')->select($where);
+                $result[$key]['option'] = Dever::db('psource/info')->select($where);
             } elseif ($value[0] == 2) {
-                $result[$key]['option'] = Dever::db('level', 'place_role')->select(['info_id' => $value[1]]);
+                $result[$key]['option'] = Dever::db('prole/level')->select(['info_id' => $value[1]]);
             }
             
             //$result['ids']['url'] = Dever::url('place/manage.getProfitData', ['s' => $value]);
@@ -42,7 +42,7 @@ class Api
     {
         if ($value) {
             $result = [];
-            $result['sales_cate_id']['option'] = Dever::db('cate', 'place_channel_sales')->select(['type' => $value]);
+            $result['sales_cate_id']['option'] = Dever::db('psales/cate')->select(['type' => $value]);
             if ($result['sales_cate_id']['option']) {
                 $result['sales_cate_id']['value'] = $result['sales_cate_id']['option'][0]['id'];
             }
@@ -60,7 +60,7 @@ class Api
     # 获取权益所需要的信息：项目下的数据
     public function getProfitData()
     {
-        return Dever::load('util', 'manage')->cascader(2, function($level, $parent) {
+        return Dever::load(\Manage\Lib\Util::class)->cascader(2, function($level, $parent) {
             $data = [];
             if ($level == 1) {
                 $data = [
@@ -69,9 +69,9 @@ class Api
                 ];
             } elseif ($level == 2) {
                 if ($parent == 1) {
-                    $data = Dever::db('channel', 'place_source')->select([]);
+                    $data = Dever::db('psource/channel')->select([]);
                 } elseif ($parent == 2) {
-                    $data = Dever::db('info', 'place_role')->select(['status' => 1]);
+                    $data = Dever::db('prole/info')->select(['status' => 1]);
                 }
             }
             return $data;

src/place/benefit/manage/Lib/Code.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class Code
 {
@@ -12,8 +12,8 @@ class Code
             }
         } else {
             $data['utype'] = 2;
-            $data['uid'] = Dever::$data['muser']['id'];
-            Dever::db('perk', 'place_benefit')->update($data['perk_id'], ['total' => ['+', 1]]);
+            $data['uid'] = Dever::getData('muser')['id'];
+            Dever::db('pbenefit/perk')->update($data['perk_id'], ['total' => ['+', 1]]);
         }
         return $data;
     }
@@ -24,6 +24,6 @@ class Code
         if (empty($data['total'])) {
             $data['total'] = 1;
         }
-        Dever::load('item', 'place_benefit')->load('perk')->createCode(2, Dever::$data['muser']['id'], $data['perk_id'], $data['num'], $data['total']);
+        Dever::load(\Pbenefit\Lib\Item::class)->load('perk')->createCode(2, Dever::getData('muser')['id'], $data['perk_id'], $data['num'], $data['total']);
     }
 }

src/place/benefit/manage/Lib/Perk.php

@@ -1,11 +1,11 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class Perk
 {
     # 获取权益数量
     public function getVoucher($id)
     {
-        return Dever::db('perk_voucher', 'place_benefit')->count(['perk_id' => $id]);
+        return Dever::db('pbenefit/perk_voucher')->count(['perk_id' => $id]);
     }
 
     # 获取创建人
@@ -13,9 +13,9 @@ class Perk
     {
         if ($utype && $uid) {
             if ($utype == 1) {
-                $user = Dever::db('info', 'place_user')->find($uid);
+                $user = Dever::db('puser/info')->find($uid);
             } elseif ($utype == 2) {
-                $user = Dever::db('user', 'sector')->find($uid);
+                $user = Dever::db('sector/user')->find($uid);
             } else {
                 $user['name'] = $user['id'] = '';
             }

src/place/benefit/manage/Lib/Rebate.php

@@ -1,18 +1,18 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class Rebate
 {
     # 获取规则信息
     public function getRule($id)
     {
-        $rule = Dever::db('rebate_rule', 'place_benefit')->select(['rebate_id' => $id]);
+        $rule = Dever::db('pbenefit/rebate_rule')->select(['rebate_id' => $id]);
         if (!$rule) {
             return '无';
         }
         $body = '';
         foreach ($rule as $v) {
             $body .= '<tr>';
-            $score = Dever::load('info', 'place_score')->get($v['score_id']);
+            $score = Dever::load(\Pscore\Lib\Info::class)->get($v['score_id']);
             $body .= '<td>'.$score['name'].'</td>';
             $body .= '<td>'.$v['level'].'</td>';
             $body .= '<td>'.$v['value'].'</td>';

src/place/benefit/manage/Lib/Role.php

@@ -1,18 +1,18 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class Role
 {
     # 获取升级奖励信息
     public function getUpgrade($id)
     {
-        $info = Dever::db('role_upgrade', 'place_benefit')->select(['level_id' => $id]);
+        $info = Dever::db('pbenefit/role_upgrade')->select(['level_id' => $id]);
         if (!$info) {
             return '无';
         }
         $body = '';
         foreach ($info as $v) {
-            $type_name = Dever::db('role_upgrade', 'place_benefit')->value('type', $v['type']);
-            $type_info = Dever::load('item', 'place_benefit')->getTypeData($v['type'], $v['type_id']);
+            $type_name = Dever::db('pbenefit/role_upgrade')->value('type', $v['type']);
+            $type_info = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($v['type'], $v['type_id']);
             $body .= '<tr>';
             $body .= '<td>'.$type_name.'</td>';
             $body .= '<td>'.$type_info['name'].'</td>';
@@ -34,14 +34,14 @@ class Role
 
     public function getPeriod($id)
     {
-        $info = Dever::db('role_period', 'place_benefit')->select(['level_id' => $id]);
+        $info = Dever::db('pbenefit/role_period')->select(['level_id' => $id]);
         if (!$info) {
             return '无';
         }
         $body = '';
         foreach ($info as $v) {
-            $type_name = Dever::db('role_period', 'place_benefit')->value('type', $v['type']);
-            $type_info = Dever::load('item', 'place_benefit')->getTypeData($v['type'], $v['type_id']);
+            $type_name = Dever::db('pbenefit/role_period')->value('type', $v['type']);
+            $type_info = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($v['type'], $v['type_id']);
             $body .= '<tr>';
             $body .= '<td>'.$type_name.'</td>';
             $body .= '<td>'.$type_info['name'].'</td>';

src/place/benefit/manage/Lib/Sales.php

@@ -1,23 +1,23 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class Sales
 {
     # 获取升级奖励信息
     public function getRebate($id, $type = '')
     {
-        $info = Dever::db('sales_rebate' . $type, 'place_benefit')->select(['sales_id' => $id]);
+        $info = Dever::db('sales_rebate' . $type, 'Pbenefit')->select(['sales_id' => $id]);
         if (!$info) {
             return '无';
         }
         $body = '';
         foreach ($info as $v) {
-            $role_name = Dever::load('info', 'place_role')->getName($v['role']);
+            $role_name = Dever::load(\Prole\Lib\Info::class)->getName($v['role']);
             $promotion = '无';
             if ($v['promotion_id']) {
-                $promotion = Dever::db('promotion', 'place_benefit')->find($v['promotion_id']);
+                $promotion = Dever::db('pbenefit/promotion')->find($v['promotion_id']);
                 $promotion = $promotion['name'];
             }
-            $scope = Dever::load('scope', 'place_benefit')->getInfoStr($v['buy_scope'], $v['buy_ids']);
+            $scope = Dever::load(\Pbenefit\Lib\Scope::class)->getInfoStr($v['buy_scope'], $v['buy_ids']);
             $body .= '<tr>';
             $body .= '<td>'.$role_name.'</td>';
             $body .= '<td>'.$scope.'</td>';

src/place/benefit/manage/Lib/Scope.php

@@ -1,4 +1,4 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class Scope
 {
@@ -16,8 +16,8 @@ class Scope
     # 获取权益所需要的范围数据
     public function getData($extend = false)
     {
-        $channel = Dever::load('manage/cate', 'place_source')->getList(true);
-        $role = Dever::db('info', 'place_role')->select(['status' => 1]);
+        $channel = Dever::load(Psource\Manage\Lib\Cate::class)->getList(true);
+        $role = Dever::db('prole/info')->select(['status' => 1]);
         $data = [
             ['id' => 1, 'name' => '资源', 'children' => $channel],
         ];
@@ -36,9 +36,9 @@ class Scope
     public function getInfo($id, $type)
     {
         if ($type == 'exchange') {
-            $data = Dever::db($type . '_scope', 'place_benefit')->select([$type . '_id' => $id]);
+            $data = Dever::db('pbenefit/' . $type . '_scope')->select([$type . '_id' => $id]);
         } else {
-            $data = Dever::db('scope', 'place_benefit')->select(['type' => $type, 'type_id' => $id]);
+            $data = Dever::db('pbenefit/scope')->select(['type' => $type, 'type_id' => $id]);
         }
         
         $result = [];
@@ -49,27 +49,27 @@ class Scope
                 $value = array_shift($v['value']);
                 if ($value == 1) {
                     $content = '范围内全部资源';
-                    $name = Dever::load('channel', 'place_source')->getName($v['value']);
+                    $name = Dever::load(Psource\Lib\Channel::class)->getName($v['value']);
                     if ($name) {
                         $v['name'] = '['.$name.']';
                     } else {
                         $v['name'] = '[全部资源]';
                     }
                     if ($v['ids']) {
-                        $source = Dever::db('info', 'place_source')->columns(['id' => ['in', $v['ids']]], 'name');
+                        $source = Dever::db('psource/info')->columns(['id' => ['in', $v['ids']]], 'name');
                         $content = implode('、', $source);
                     }
                     $unit = '个';
                 } elseif ($value == 2) {
                     $content = '范围内全部身份';
-                    $name = Dever::load('info', 'place_role')->getName($v['value']);
+                    $name = Dever::load(\Prole\Lib\Info::class)->getName($v['value']);
                     if ($name) {
                         $v['name'] = '['.$name.']';
                     } else {
                         $v['name'] = '[全部身份]';
                     }
                     if ($v['ids']) {
-                        $source = Dever::db('level', 'place_role')->columns(['id' => ['in', $v['ids']]], 'name');
+                        $source = Dever::db('prole/level')->columns(['id' => ['in', $v['ids']]], 'name');
                         $content = implode('、', $source);
                     }
                     $unit = '个';

src/place/benefit/manage/Lib/User.php

@@ -1,21 +1,21 @@
-<?php namespace Place_benefit\Manage\Lib;
+<?php namespace Pbenefit\Manage\Lib;
 use Dever;
 class User
 {
     public function getTypeInfo($type, $type_id)
     {
-        $info = Dever::load('item', 'place_benefit')->getTypeData($type, $type_id);
+        $info = Dever::load(\Pbenefit\Lib\Item::class)->getTypeData($type, $type_id);
         return $info['name'];
     }
 
     public function getSourceInfo($source, $source_id)
     {
         if ($source == 2) {
-            $db = Dever::db('perk', 'place_benefit');
+            $db = Dever::db('pbenefit/perk');
         } elseif ($source == 10) {
-            $db = Dever::db('user', 'sector');
+            $db = Dever::db('sector/user');
         } else {
-            $db = Dever::db('info', 'place_role');
+            $db = Dever::db('prole/info');
         }
         $info = $db->find($source_id);
         return $info['name'] ?? '-';
@@ -31,12 +31,12 @@ class User
             $where['id'] = $data['user'];
         }
         $where['status'] = 1;
-        $user = Dever::db('info', 'place_user')->find($where);
+        $user = Dever::db('puser/info')->find($where);
         if (!$user) {
             Dever::error('用户不存在');
         }
-        $data['id'] = Dever::$data['muser']['id'];
-        Dever::load('user', 'place_benefit')->receive($user['id'], $data, 10);
+        $data['id'] = Dever::getData('muser')['id'];
+        Dever::load(\Pbenefit\Lib\User::class)->receive($user['id'], $data, 10);
         return 'end';
     }
 }

src/place/benefit/manage/bonus.php

@@ -26,13 +26,13 @@ return [
             'give_level' => [
                 'give_source' => [2,4],
             ],
-            'place_benefit/scope' => 'type=1',
+            'pbenefit/scope' => 'type=1',
             'sell_cash' => 'type=1',
             'holding_score_id' => 'type=2',
             'holding_score_value' => 'type=2',
         ],
         'tab' => [
-            '基本信息' => 'name,type,place_benefit/scope,sell_cash,holding_score_id,holding_score_value,',
+            '基本信息' => 'name,type,pbenefit/scope,sell_cash,holding_score_id,holding_score_value,',
             '奖励设置' => 'give_source,give_level,give_score_id,give_value,give_value_max',
             '结算设置' => 'period,period_day',
         ],
@@ -58,7 +58,7 @@ return [
                 'desc' => '用户本人最少持有多少积分数值才能参与本次分红',
             ],
 
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '消费范围',
                 'tip' => '不添加消费范围，全场可用',
                 'where'  => ['type' => 'bonus', 'type_id' => 'id'],

src/place/benefit/manage/buy.php

@@ -12,7 +12,7 @@ return [
                 'name' => '应用范围',
                 'location' => 'right',
                 //'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "buy"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "buy"])',
             ],
             'sort',
             'status',
@@ -31,7 +31,7 @@ return [
     'update' => [
         'tab' => [
             '基本信息' => 'name,day,value,num',
-            '应用范围' => 'place_benefit/scope',
+            '应用范围' => 'pbenefit/scope',
         ],
 
         'field'    => [
@@ -56,7 +56,7 @@ return [
                 'autosize' => ['minRows' => 4],
             ],
 
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '应用范围',
                 'tip' => '不添加应用范围，全场可用',
                 'where'  => ['type' => 'buy', 'type_id' => 'id'],

src/place/benefit/manage/core.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'menu' => [
-        'place_benefit' => [
+        'pbenefit' => [
             'parent'    => 'sector_place_benefit',
             'name'      => '基础权益',
             'icon'      => 'mini-program-line',
@@ -9,47 +9,47 @@ return [
         ],
         
         'promotion' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '促销',
             'icon'      => 'discord-line',
             'sort'      => '1',
         ],
         'rebate' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '返利',
             'icon'      => 'cast-line',
             'sort'      => '10',
         ],
         'bonus' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '分红',
             'icon'      => 'money-cny-box-line',
             'sort'      => '20',
         ],
         
         'coupon' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '优惠券',
             'icon'      => 'coupon-3-line',
             'sort'      => '30',
         ],
 
         'gift' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '礼品卡',
             'icon'      => 'bank-card-line',
             'sort'      => '40',
         ],
 
         'score' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '积分规则',
             'icon'      => 'currency-line',
             'sort'      => '50',
         ],
 
         'score_action' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '身份行为权益',
             'sort'      => '100',
             'show'      => 3
@@ -57,7 +57,7 @@ return [
 
         /*
         'exchange' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '兑换',
             'icon'      => 'dribbble-fill',
             'sort'      => '60',
@@ -65,7 +65,7 @@ return [
         */
 
         'held' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '持有权',
             'icon'      => 'flood-line',
             'sort'      => '70',
@@ -73,40 +73,40 @@ return [
 
         /*
         'buy' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '购买限额',
             'icon'      => 'product-hunt-line',
             'sort'      => '80',
         ],
         'visit' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '访问限额',
             'icon'      => 'coupon-5-line',
             'sort'      => '90',
         ],*/
 
         'perk' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '权益包',
             'icon'      => 'database-2-line',
             'sort'      => '100',
         ],
         
         'perk_code' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '权益包兑换码',
             'sort'      => '100',
             'show'      => 3
         ],
         'perk_voucher' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '权益包权益',
             'sort'      => '100',
             'show'      => 3
         ],
 
         'perk_create_code' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '兑换码生成',
             'icon'      => 'coupon-3-line',
             'sort'      => '100',
@@ -114,13 +114,13 @@ return [
         ],
 
         'scope' => [
-            'parent'    => 'place_benefit',
+            'parent'    => 'pbenefit',
             'name'      => '权益应用范围',
             'sort'      => '100',
             'show'      => 3
         ],
 
-        'place_benefit_role' => [
+        'pbenefit_role' => [
             'parent'    => 'sector_place_benefit',
             'name'      => '权益分配',
             'icon'      => 'device-line',
@@ -128,35 +128,35 @@ return [
         ],
 
         'role' => [
-            'parent'    => 'place_benefit_role',
+            'parent'    => 'pbenefit_role',
             'name'      => '身份权益',
             'icon'      => 'surround-sound-line',
             'sort'      => '1',
         ],
 
         'user' => [
-            'parent'    => 'place_benefit_role',
+            'parent'    => 'pbenefit_role',
             'name'      => '用户权益',
             'icon'      => 'admin-line',
             'sort'      => '2',
         ],
 
         'user_log' => [
-            'parent'    => 'place_benefit_role',
+            'parent'    => 'pbenefit_role',
             'name'      => '用户权益记录',
             'sort'      => '100',
             'show'      => 3
         ],
 
         'sales' => [
-            'parent'    => 'place_benefit_role',
+            'parent'    => 'pbenefit_role',
             'name'      => '销售权益',
             'icon'      => 'safe-2-line',
             'sort'      => '3',
         ],
 
         'sales_rebate' => [
-            'parent'    => 'place_benefit_role',
+            'parent'    => 'pbenefit_role',
             'name'      => '销售返利权益',
             'sort'      => '100',
             'show'      => 3

src/place/benefit/manage/coupon.php

@@ -18,7 +18,7 @@ return [
                 'name' => '应用范围',
                 'location' => 'right',
                 //'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "coupon"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "coupon"])',
             ],
             'sort',
             'status',
@@ -51,7 +51,7 @@ return [
         'tab' => [
             '基本信息' => 'name,desc,get,min,type,value_1,value_2,value_3,total,limit',
             '有效期设置' => 'date_type,date_start,date_end,date_day',
-            '应用范围' => 'place_benefit/scope',
+            '应用范围' => 'pbenefit/scope',
         ],
 
         'field'    => [
@@ -120,7 +120,7 @@ return [
                 'autosize' => ['minRows' => 4],
             ],
 
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '应用范围',
                 'tip' => '不添加应用范围，全场可用',
                 'where'  => ['type' => 'coupon', 'type_id' => 'id'],

src/place/benefit/manage/exchange.php

@@ -8,7 +8,7 @@ return [
                 'name' => '兑换范围',
                 'location' => 'right',
                 //'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "exchange"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "exchange"])',
             ],
             'sort',
             'status',
@@ -34,7 +34,7 @@ return [
                 'autosize' => ['minRows' => 4],
             ],
 
-            'place_benefit/exchange_scope' => [
+            'pbenefit/exchange_scope' => [
                 'name' => '可兑换范围',
                 'where'  => ['exchange_id' => 'id'],
                 'desc' => '如填写数量是10，就是在当前可兑换范围内任意选择10个进行免费兑换',

src/place/benefit/manage/exchange_scope.php

@@ -6,8 +6,8 @@ return [
                 'name'      => '可兑换范围',
                 'type' => 'cascader',
                 'check' => true,
-                'option'    => 'Dever::call("place_benefit/manage/scope.getData")',
-                'remote' => 'place_benefit/manage/api.getScope',
+                'option'    => 'Dever::call("Pbenefit/Manage/Lib/Scope.getData")',
+                'remote' => 'Pbenefit/Manage/Api/Main/Main.getScope',
                 'width' => '100%',
                 'clearable' => true,
             ],

src/place/benefit/manage/gift.php

@@ -17,7 +17,7 @@ return [
                 'name' => '应用范围',
                 'location' => 'right',
                 //'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "gift"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "gift"])',
             ],
             'sort',
             'status',
@@ -43,7 +43,7 @@ return [
         'tab' => [
             '基本信息' => 'name,desc,min,value,total,limit',
             '有效期设置' => 'date_type,date_start,date_end,date_day',
-            '应用范围' => 'place_benefit/scope',
+            '应用范围' => 'pbenefit/scope',
         ],
 
         'field'    => [
@@ -91,7 +91,7 @@ return [
                 'autosize' => ['minRows' => 4],
             ],
 
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '应用范围',
                 'tip' => '不添加应用范围，全场可用',
                 'where'  => ['type' => 'gift', 'type_id' => 'id'],

src/place/benefit/manage/perk.php

@@ -8,7 +8,7 @@ return [
             'limit',
             'voucher' => [
                 'name' => '权益数量',
-                'show' => 'Dever::call("place_benefit/manage/perk.getVoucher", {id})',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Perk.getVoucher", {id})',
             ],
             'wallet' => [
                 'name' => '数量',
@@ -25,9 +25,9 @@ return [
             '编辑' => ['edit'],
             //'删除' => 'delete',
             '兑换码' => ['route', [
-                'path' => 'place_benefit/perk_code',
+                'path' => 'pbenefit/perk_code',
                 'param' => [
-                    'set' => ['perk_id' => 'id', 'menu' => 'place_benefit/perk', 'parent' => 'place_benefit/perk'],
+                    'set' => ['perk_id' => 'id', 'menu' => 'pbenefit/perk', 'parent' => 'pbenefit/perk'],
                 ],
             ]],
         ],
@@ -47,7 +47,7 @@ return [
             '基本信息' => 'name,desc,give,limit',
             '有效期设置' => 'date_type,date_start,date_end,date_day',
             '兑换码设置' => 'code_type,code_prefix,code_length',
-            '权益设置' => 'place_benefit/perk_voucher',
+            '权益设置' => 'pbenefit/perk_voucher',
         ],
 
         'field'    => [
@@ -98,7 +98,7 @@ return [
                 'tip' => '输入生成的兑换码长度，不包括前缀',
             ],
 
-            'place_benefit/perk_voucher' => [
+            'pbenefit/perk_voucher' => [
                 'name' => '权益列表',
                 'where'  => ['perk_id' => 'id'],
             ],

src/place/benefit/manage/perk_code.php

@@ -1,5 +1,5 @@
 <?php
-$perk_id = Dever::load('util', 'manage')->request('perk_id');
+$perk_id = Dever::load(\Manage\Lib\Util::class)->request('perk_id');
 return [
     'list' => [
         'where' => ['perk_id' => $perk_id],
@@ -7,7 +7,7 @@ return [
             'perk_id',
             'utype',
             'uid' => [
-                'show' => 'Dever::call("place_benefit/manage/perk.getCodeUser", ["{utype}", "{uid}"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Perk.getCodeUser", ["{utype}", "{uid}"])',
             ],
             'code',
             'total',
@@ -16,7 +16,7 @@ return [
         ],
         'button' => [
             '新增' => ['fastadd', ['perk_id' => $perk_id]],
-            '批量生成' => ['fastadd', ['path' => 'place_benefit/perk_create_code', 'field' => ['perk_id' => $perk_id]]],
+            '批量生成' => ['fastadd', ['path' => 'pbenefit/perk_create_code', 'field' => ['perk_id' => $perk_id]]],
         ],
         'data_button' => [
             '编辑' => ['fastedit', ['perk_id' => $perk_id]],
@@ -28,7 +28,7 @@ return [
     ],
 
     'update' => [
-        'start' => 'place_benefit/manage/code.check',
+        'start' => 'Pbenefit/Manage/Lib/Code.check',
         'field'    => [
             'perk_id',
             'code' => [

src/place/benefit/manage/perk_create_code.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'update' => [
-        'end' => 'place_benefit/manage/code.create',
+        'end' => 'Pbenefit/Manage/Lib/Code.create',
         'field'    => [
             'perk_id',
             'num' => [

src/place/benefit/manage/perk_voucher.php

@@ -4,7 +4,7 @@ return [
         'field'    => [
             'type' => [
                 'type' => 'select',
-                'remote' => 'place_benefit/manage/api.getType',
+                'remote' => 'Pbenefit/Manage/Api/Main.getType',
             ],
             'type_id' => [
                 'rules' => true,

src/place/benefit/manage/promotion.php

@@ -12,7 +12,7 @@ return [
                 'name' => '应用范围',
                 'location' => 'right',
                 //'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "promotion"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "promotion"])',
             ],
             'sort',
             'status',
@@ -32,7 +32,7 @@ return [
     'update' => [
         'tab' => [
             '基本信息' => 'name,desc,type,value',
-            '应用范围' => 'tag,place_benefit/scope',
+            '应用范围' => 'tag,pbenefit/scope',
         ],
 
         'field'    => [
@@ -63,7 +63,7 @@ return [
                 'tip' => '如不设置，默认展示促销名称',
                 'maxlength' => 15,
             ],
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '应用范围',
                 'tip' => '不添加应用范围，全场可用',
                 'where'  => ['type' => 'promotion', 'type_id' => 'id'],

src/place/benefit/manage/rebate.php

@@ -7,7 +7,7 @@ return [
             ],
             'rule' => [
                 'name' => '返利规则',
-                'show' => 'Dever::call("place_benefit/manage/rebate.getRule", {id})',
+                'show' => 'Dever::call("Pbenefit/manage/rebate.getRule", {id})',
             ],
             'scope' => [
                 'width' => '120px',
@@ -15,7 +15,7 @@ return [
                 'name' => '应用范围',
                 'location' => 'right',
                 //'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "rebate"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "rebate"])',
             ],
             'sort',
             'status',
@@ -33,8 +33,8 @@ return [
     ],
     'update' => [
         'tab' => [
-            '基本信息' => 'name,place_benefit/rebate_rule',
-            '应用范围' => 'place_benefit/scope',
+            '基本信息' => 'name,pbenefit/rebate_rule',
+            '应用范围' => 'pbenefit/scope',
         ],
 
         'field'    => [
@@ -47,12 +47,12 @@ return [
                 'autosize' => ['minRows' => 4],
             ],
 
-            'place_benefit/rebate_rule' => [
+            'pbenefit/rebate_rule' => [
                 'name' => '返利规则',
                 'where'  => ['rebate_id' => 'id'],
             ],
 
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '应用范围',
                 'tip' => '不添加应用范围，全场可用',
                 'where'  => ['type' => 'rebate', 'type_id' => 'id'],

src/place/benefit/manage/role.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'source' => 'place_role/level',
+    'source' => 'Prole/level',
     'list' => [
         'field'      => [
             'info_id' => [
@@ -13,11 +13,11 @@ return [
             ],
             'role_upgrade' => [
                 'name' => '固定权益',
-                'show' => 'Dever::call("place_benefit/manage/role.getUpgrade", {id})',
+                'show' => 'Dever::call("Pbenefit/manage/role.getUpgrade", {id})',
             ],
             'role_period' => [
                 'name' => '周期权益',
-                'show' => 'Dever::call("place_benefit/manage/role.getPeriod", {id})',
+                'show' => 'Dever::call("Pbenefit/manage/role.getPeriod", {id})',
             ],
         ],
         'button' => [
@@ -28,9 +28,9 @@ return [
 
             /* 这里很复杂，以后再加吧，所有用户的行为都有不同的权益
             '行为权益' => ['route', [
-                'path' => 'place_benefit/role_action',
+                'path' => 'Pbenefit/role_action',
                 'param' => [
-                    'set' => ['level_id' => 'id', 'menu' => 'place_benefit/role', 'parent' => 'place_benefit/role'],
+                    'set' => ['level_id' => 'id', 'menu' => 'Pbenefit/role', 'parent' => 'Pbenefit/role'],
                 ],
             ]],*/
         ],
@@ -49,13 +49,13 @@ return [
                 'type' => 'text',
                 'disable' => true,
             ],
-            'place_benefit/role_upgrade' => [
+            'pbenefit/role_upgrade' => [
                 'name' => '固定权益',
                 'tip' => '无需用户主动领取<br />增加和删除权益将影响现有身份等级所有用户',
                 'where'  => ['level_id' => 'id'],
             ],
 
-            'place_benefit/role_period' => [
+            'pbenefit/role_period' => [
                 'name' => '周期权益',
                 'tip' => '需要用户在权益里手动领取，领取本周期权益后才可以领取下一周期权益<br />增加和删除权益仅影响后续发放奖励的用户',
                 'where'  => ['level_id' => 'id'],

src/place/benefit/manage/role_period.php

@@ -4,7 +4,7 @@ return [
         'field'    => [
             'type' => [
                 'type' => 'select',
-                'remote' => 'place_benefit/manage/api.getType',
+                'remote' => 'Pbenefit/Manage/Api/Main.getType',
             ],
             'type_id' => [
                 'rules' => true,

src/place/benefit/manage/role_upgrade.php

@@ -4,7 +4,7 @@ return [
         'field'    => [
             'type' => [
                 'type' => 'select',
-                'remote' => 'place_benefit/manage/api.getType',
+                'remote' => 'Pbenefit/Manage/Api/Main.getType',
             ],
             'type_id' => [
                 'rules' => true,

src/place/benefit/manage/sales.php

@@ -13,11 +13,11 @@ return [
             ],
             'rebate' => [
                 'name' => '自营返利',
-                'show' => 'Dever::call("place_benefit/manage/sales.getRebate", [{id}])',
+                'show' => 'Dever::call("Pbenefit/manage/sales.getRebate", [{id}])',
             ],
             'rebate_platform' => [
                 'name' => '平台返利',
-                'show' => 'Dever::call("place_benefit/manage/sales.getRebate", [{id}, "_platform"])',
+                'show' => 'Dever::call("Pbenefit/manage/sales.getRebate", [{id}, "_platform"])',
             ],
         ],
         'button' => [
@@ -33,13 +33,13 @@ return [
     'update' => [
         'tab' => [
             '基本信息' => 'sales_type,sales_cate_id,desc',
-            '返利设置' => 'score_id,place_benefit/sales_rebate,place_benefit/sales_rebate_platform',
+            '返利设置' => 'score_id,pbenefit/sales_rebate,pbenefit/sales_rebate_platform',
         ],
         'field'    => [
             'sales_type' => [
                 'type' => 'radio',
                 'rules' => true,
-                'remote' => 'place_benefit/manage/api.getSalesCate',
+                'remote' => 'Pbenefit/Manage/Api/Main.getSalesCate',
             ],
             'sales_cate_id' => [
                 'rules' => true,
@@ -49,12 +49,12 @@ return [
                 'rules' => true,
                 'type' => 'radio',
             ],
-            'place_benefit/sales_rebate' => [
+            'pbenefit/sales_rebate' => [
                 'name' => '自营返利',
                 'where'  => ['sales_id' => 'id'],
                 'tip' => '销售渠道自行销售时的返利设置',
             ],
-            'place_benefit/sales_rebate_platform' => [
+            'pbenefit/sales_rebate_platform' => [
                 'name' => '平台返利',
                 'where'  => ['sales_id' => 'id'],
                 'tip' => '销售渠道代平台销售时的返利设置',

src/place/benefit/manage/sales_rebate.php

@@ -4,15 +4,15 @@ return [
         'field'    => [
             'role' => [
                 'type' => 'cascader',
-                'option'    => 'Dever::call("place_role/manage/data.getOption")',
+                'option'    => 'Dever::call("Prole/Manage/Lib/Data.getOption")',
                 'width' => '100%',
                 'clearable' => true,
             ],
             'buy_scope' => [
                 'type' => 'cascader',
                 'check' => true,
-                'option'    => 'Dever::call("place_benefit/manage/scope.getData")',
-                'remote' => 'place_benefit/manage/api.getSalesScope',
+                'option'    => 'Dever::call("Pbenefit/Manage/Lib/Scope.getData")',
+                'remote' => 'Pbenefit/Manage/Api/Main.getSalesScope',
                 'width' => '100%',
                 'clearable' => true,
             ],

src/place/benefit/manage/scope.php

@@ -6,8 +6,8 @@ return [
                 'name'      => '选择范围',
                 'type' => 'cascader',
                 'check' => true,
-                'option'    => 'Dever::call("place_benefit/manage/scope.getData")',
-                'remote' => 'place_benefit/manage/api.getScope',
+                'option'    => 'Dever::call("Pbenefit/Manage/Lib/Scope.getData")',
+                'remote' => 'Pbenefit/Manage/Api/Main.getScope',
                 'width' => '100%',
                 'clearable' => true,
             ],

src/place/benefit/manage/score.php

@@ -21,13 +21,13 @@ return [
         'data_button' => [
             '编辑' => ['fastedit', 'name,score_id,desc,recharge,exchange,withdraw'],
             '行为' => ['route', [
-                'path' => 'place_benefit/score_action',
+                'path' => 'pbenefit/score_action',
                 'param' => [
-                    'set' => ['score_id' => 'id', 'score_info_id' => 'score_info_id', 'menu' => 'place_benefit/score', 'parent' => 'place_benefit/score'],
+                    'set' => ['score_id' => 'id', 'score_info_id' => 'score_info_id', 'menu' => 'pbenefit/score', 'parent' => 'pbenefit/score'],
                 ],
             ]],
-            '充值' => ['fastedit', 'place_benefit/score_recharge', '','recharge=1'],
-            '兑换' => ['fastedit', 'place_benefit/score_exchange', '','exchange=1'],
+            '充值' => ['fastedit', 'pbenefit/score_recharge', '','recharge=1'],
+            '兑换' => ['fastedit', 'pbenefit/score_exchange', '','exchange=1'],
             '提现' => ['fastedit', 'withdraw_fee,withdraw_min,withdraw_max,withdraw_limit', '','withdraw=1'],
         ],
         'search'    => [
@@ -55,7 +55,7 @@ return [
                 'type' => 'radio',
             ],
 
-            'place_benefit/score_recharge' => [
+            'pbenefit/score_recharge' => [
                 'name' => '充值设置',
                 'where'  => ['score_id' => 'id'],
             ],
@@ -66,7 +66,7 @@ return [
                 'type' => 'radio',
             ],
 
-            'place_benefit/score_exchange' => [
+            'pbenefit/score_exchange' => [
                 'name' => '兑换设置',
                 'where'  => ['score_id' => 'id'],
             ],

src/place/benefit/manage/score_action.php

@@ -1,6 +1,6 @@
 <?php
-$score_id = Dever::load('util', 'manage')->request('score_id');
-$score_info_id = Dever::load('util', 'manage')->request('score_info_id');
+$score_id = Dever::load(\Manage\Lib\Util::class)->request('score_id');
+$score_info_id = Dever::load(\Manage\Lib\Util::class)->request('score_info_id');
 return [
     'list' => [
         'where' => ['score_id' => $score_id],

src/place/benefit/manage/score_exchange.php

@@ -1,12 +1,12 @@
 <?php
-$score_id = Dever::load('util', 'manage')->request('score_id');
+$score_id = Dever::load(\Manage\Lib\Util::class)->request('score_id');
 return [
     'update' => [
         'field'    => [
             'exchange_score_id' => [
                 'type' => 'select',
                 'tip' => '选择要兑换的目标积分',
-                'option' => 'Dever::call("place_score/manage/info.getList", '.$score_id.')',
+                'option' => 'Dever::call("Pscore/manage/info.getList", '.$score_id.')',
             ],
             'value' => [
                 'tip' => '直接输入要兑换的数值，如输入100，就是当前积分1个可以兑换100个目标积分',

src/place/benefit/manage/user.php

@@ -3,12 +3,12 @@ return [
     'list' => [
         'desc' => '用户权益列表仅展示用户已领取的权益，包括身份周期权益以及权益包里的权益，不包括身份固定权益',
         'field'      => [
-            'uid' => Dever::call('place_user/manage/user.getListInfo'),
+            'uid' => Dever::call('Puser/Manage/Lib/User.getListInfo'),
             'type' => [
                 
             ],
             'type_id' => [
-                'show' => 'Dever::call("place_benefit/manage/user.getTypeInfo", [{type}, {type_id}])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/User.getTypeInfo", [{type}, {type_id}])',
             ],
             'num' => [
                 'name' => '剩余数量',
@@ -21,20 +21,20 @@ return [
         ],
         'data_button' => [
             '权益记录' => ['route', [
-                'path' => 'place_benefit_role/user_log',
+                'path' => 'pbenefit_role/user_log',
                 'param' => [
-                    'set' => ['user_id' => 'id', 'menu' => 'place_benefit_role/user', 'parent' => 'place_benefit_role/user'],
+                    'set' => ['user_id' => 'id', 'menu' => 'pbenefit_role/user', 'parent' => 'pbenefit_role/user'],
                 ],
             ]]
         ],
         'search'    => [
-            'search' => Dever::call('place_user/manage/user.getListSearch'),
+            'search' => Dever::call('Puser/Manage/Lib/User.getListSearch'),
             'type',
             'status',
         ],
     ],
     'update' => [
-        'start' => 'place_benefit/manage/user.update',
+        'start' => 'Pbenefit/Manage/Lib/User.update',
         'field'    => [
             'user' => [
                 'rules' => true,
@@ -44,7 +44,7 @@ return [
             'type' => [
                 'type' => 'select',
                 'rules' => true,
-                'remote' => 'place_benefit/manage/api.getType',
+                'remote' => 'Pbenefit/Manage/Api/Main.getType',
             ],
             'type_id' => [
                 'rules' => true,

src/place/benefit/manage/user_log.php

@@ -1,18 +1,18 @@
 <?php
 return [
     'list' => [
-        'where' => ['user_id' => Dever::load('util', 'manage')->request('user_id')],
+        'where' => ['user_id'],
         'field'      => [
-            'uid' => Dever::call('place_user/manage/user.getListInfo'),
+            'uid' => Dever::call('Puser/Manage/Lib/User.getListInfo'),
             'type' => [
                 
             ],
             'type_id' => [
-                'show' => 'Dever::call("place_benefit/manage/user.getTypeInfo", [{type}, {type_id}])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/User.getTypeInfo", [{type}, {type_id}])',
             ],
             'source',
             'source_id' => [
-                'show' => 'Dever::call("place_benefit/manage/user.getSourceInfo", [{source}, {source_id}])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/User.getSourceInfo", [{source}, {source_id}])',
             ],
             'num' => [
                 'name' => '领取数量',

src/place/benefit/manage/visit.php

@@ -11,7 +11,7 @@ return [
                 'name' => '应用范围',
                 'location' => 'right',
                 'tag' => true,
-                'show' => 'Dever::call("place_benefit/manage/scope.getInfo", [{id}, "visit"])',
+                'show' => 'Dever::call("Pbenefit/Manage/Lib/Scope.getInfo", [{id}, "visit"])',
             ],
             'sort',
             'status',
@@ -30,7 +30,7 @@ return [
     'update' => [
         'tab' => [
             '基本信息' => 'name,day,value,start,end',
-            '应用范围' => 'place_benefit/scope',
+            '应用范围' => 'pbenefit/scope',
         ],
 
         'field'    => [
@@ -51,7 +51,7 @@ return [
                 'autosize' => ['minRows' => 4],
             ],
 
-            'place_benefit/scope' => [
+            'pbenefit/scope' => [
                 'name' => '应用范围',
                 'tip' => '不添加应用范围，全场可用',
                 'where'  => ['type' => 'visit', 'type_id' => 'id'],

src/place/benefit/table/bonus.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '分红表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [
@@ -27,7 +27,7 @@ return [
         'holding_score_id'        => [
             'name'      => '持有积分',
             'type'      => 'int(11)',
-            'value'     => 'place_score/info',
+            'value'     => 'pscore/info',
             'default'   => 1,
         ],
 
@@ -57,7 +57,7 @@ return [
         'give_score_id'        => [
             'name'      => '奖励积分',
             'type'      => 'int(11)',
-            'value'     => 'place_score/info',
+            'value'     => 'pscore/info',
             'default'   => 1,
         ],
 

src/place/benefit/table/buy.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '购买限额表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc',
     'struct' => [
         'name' => [

src/place/benefit/table/coupon.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '优惠券',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/exchange.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '兑换',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/exchange_scope.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '兑换范围',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'id asc',
     'struct' => [
         'exchange_id'       => [

src/place/benefit/table/gift.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '礼品卡',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/held.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '持有权',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/perk.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '权益包',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/perk_code.php

@@ -1,12 +1,12 @@
 <?php
 return [
     'name' => '权益包兑换码表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'perk_id'       => [
             'type'      => 'int(11)',
             'name'      => '权益包',
-            'value'     => 'place_benefit/perk',
+            'value'     => 'pbenefit/perk',
         ],
         'code'       => [
             'name'      => '兑换码',

src/place/benefit/table/perk_code_item.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '权益包包含项目',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'status asc',
     'struct' => [
         'perk_code_id'       => [
@@ -12,7 +12,7 @@ return [
             'name'      => '类型',
             'type'      => 'varchar(15)',
             'default'   => 'select',
-            'value'    => 'Dever::call("place_benefit/item.getType", 3)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 3)',
         ],
 
         'type_id'        => [

src/place/benefit/table/perk_create_code.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '权益包兑换码生成表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'perk_id'       => [
             'type'      => 'int(11)',

src/place/benefit/table/perk_voucher.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '权益包权益',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'perk_id'       => [
@@ -12,7 +12,7 @@ return [
             'name'      => '类型',
             'type'      => 'varchar(15)',
             'default'   => '',
-            'value'    => 'Dever::call("place_benefit/item.getType", 3)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 3)',
         ],
 
         'type_id'        => [

src/place/benefit/table/promotion.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '促销表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/rebate.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '返利表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [

src/place/benefit/table/rebate_rule.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '返利规则设置表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'rebate_id'       => [
@@ -11,7 +11,7 @@ return [
         'score_id'        => [
             'name'      => '奖励积分',
             'type'      => 'int(11)',
-            'value'     => 'place_score/info',
+            'value'     => 'Pscore/info',
         ],
         'level'       => [
             'name'      => '奖励层级',

src/place/benefit/table/role_action.php

@@ -1,13 +1,13 @@
 <?php
 return [
     'name' => '身份行为权益设置表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'level_id'        => [
             'name'      => '身份等级',
             'type'      => 'int(11)',
-            'value'     => 'place_role/level',
+            'value'     => 'Prole/level',
         ],
 
         'action_type'        => [
@@ -34,7 +34,7 @@ return [
             'name'      => '类型',
             'type'      => 'varchar(15)',
             'default'   => '',
-            'value'    => 'Dever::call("place_benefit/item.getType", 2)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 2)',
         ],
 
         'type_id'        => [

src/place/benefit/table/role_period.php

@@ -1,20 +1,20 @@
 <?php
 return [
     'name' => '身份周期奖励权益设置表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'level_id'        => [
             'name'      => '身份等级',
             'type'      => 'int(11)',
-            'value'     => 'place_role/level',
+            'value'     => 'Prole/level',
         ],
         
         'type'        => [
             'name'      => '类型',
             'type'      => 'varchar(15)',
             'default'   => '',
-            'value'    => 'Dever::call("place_benefit/item.getType", 2)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 2)',
         ],
 
         'type_id'        => [

src/place/benefit/table/role_upgrade.php

@@ -1,20 +1,20 @@
 <?php
 return [
     'name' => '身份升级奖励权益设置表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'level_id'        => [
             'name'      => '身份等级',
             'type'      => 'int(11)',
-            'value'     => 'place_role/level',
+            'value'     => 'Prole/level',
         ],
         
         'type'        => [
             'name'      => '类型',
             'type'      => 'varchar(15)',
             'default'   => '',
-            'value'    => 'Dever::call("place_benefit/item.getType", 1)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 1)',
         ],
 
         'type_id'        => [

src/place/benefit/table/sales.php

@@ -1,25 +1,25 @@
 <?php
 return [
     'name' => '销售渠道权益',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'sales_type' => [
             'name'      => '销售类型',
             'type'      => 'tinyint(1)',
-            'value'     => 'Dever::call("place_channel_sales/info.getType")',
+            'value'     => 'Dever::call("Psales/Lib/Info.getType")',
             'default'   => '1',
         ],
 
         'sales_cate_id' => [
             'name'      => '销售分类',
             'type'      => 'int(11)',
-            'value'    => 'place_channel_sales/cate',
+            'value'    => 'psales/cate',
         ],
 
         'score_id'        => [
             'name'      => '奖励积分',
             'type'      => 'int(11)',
-            'value'     => 'place_score/info',
+            'value'     => 'pscore/info',
             'default'   => '1',
         ],
 

src/place/benefit/table/sales_rebate.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '销售渠道自营返利权益',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'id asc',
     'struct' => [
         'sales_id' => [
@@ -36,7 +36,7 @@ return [
         'promotion_id' => [
             'name'      => '购买促销',
             'type'      => 'int(11)',
-            'value'     => 'place_benefit/promotion',
+            'value'     => 'pbenefit/promotion',
         ],
 
         'value' => [

src/place/benefit/table/scope.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '权益使用范围',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'id asc',
     'struct' => [
         'type'        => [

src/place/benefit/table/score.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '积分规则表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc,id desc',
     'struct' => [
         'name' => [
@@ -16,7 +16,7 @@ return [
         'score_id'        => [
             'name'      => '积分',
             'type'      => 'int(11)',
-            'value'     => 'place_score/info',
+            'value'     => 'pscore/info',
         ],
 
         'recharge' => [

src/place/benefit/table/score_action.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '积分规则-用户行为设置表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'score_id'        => [
             'name'      => '积分规则id',
@@ -16,7 +16,7 @@ return [
         'action_id'        => [
             'name'      => '用户行为',
             'type'      => 'int(11)',
-            'value'     => 'Dever::call("place_score/manage/action.getList")',
+            'value'     => 'Dever::call("Pscore/manage/action.getList")',
         ],
 
         'num'        => [

src/place/benefit/table/score_exchange.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '积分规则-兑换表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'score_id'        => [
             'name'      => '积分规则id',
@@ -11,7 +11,7 @@ return [
         'exchange_score_id'        => [
             'name'      => '目标积分',
             'type'      => 'int(11)',
-            'value'     => 'place_score/info',
+            'value'     => 'pscore/info',
         ],
 
         'value' => [

src/place/benefit/table/score_recharge.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '积分规则-充值规则表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'id asc',
     'struct' => [
         'score_id'        => [

src/place/benefit/table/user.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '用户权益',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'uid'        => [
             'name'      => '用户ID',
@@ -11,7 +11,7 @@ return [
         'type'        => [
             'name'      => '权益类型',
             'type'      => 'varchar(15)',
-            'value'    => 'Dever::call("place_benefit/item.getType", 2)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 2)',
         ],
 
         'type_id'        => [

src/place/benefit/table/user_log.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '用户权益领取记录表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'uid'        => [
             'name'      => '用户',
@@ -16,7 +16,7 @@ return [
         'type'        => [
             'name'      => '权益类型',
             'type'      => 'varchar(15)',
-            'value'    => 'Dever::call("place_benefit/item.getType", 2)',
+            'value'    => 'Dever::call("Pbenefit/Lib/Item.getType", 2)',
         ],
 
         'type_id'        => [

src/place/benefit/table/visit.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => '访问限额表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'order' => 'sort asc',
     'struct' => [
         'name' => [

src/place/boot.php

@@ -1,133 +1,127 @@
 <?php
-# place 品牌入口
 class Place
 {
-    public static $info;
-    public static $user;
-    public static $uid;
-    public static $code;
-    public static $nav;
-    public static $system;
-    public static $sector;
-    #public static $module;
-
-    # 生成访问码
-    public static function encode($sector_id, $account_id, $place_id, $sales_type = 0, $sales_id = 0, $uid = 0)
-    {
-        return Dever::load('info', 'place')->encode($sector_id, $account_id, $place_id, $sales_type, $sales_id, $uid);
-    }
-
-    # 解析访问码
-    public static function decode()
-    {
-        self::$code = Dever::input('p');
-        return Dever::load('info', 'place')->decode(self::$code);
-    }
-
+    public $system;
+    public $sector;
+    public $info;
+    public $user;
+    public $uid;
+    public $code;
+    public $nav;
+    
     # 初始化
-    public static function init()
+    public function __construct()
     {
-        list($sector_id, $account_id, $place_id, $sales_type, $sales_id, $uid) = self::decode();
-        self::$system = Dever::db('system', 'manage')->find(['key' => 'sector']);
-        self::$sector = Dever::db(self::$system['info_table'])->find($sector_id);
-        if (!self::$sector) {
+        list($sector_id, $account_id, $place_id, $sales_type, $sales_id, $uid) = $this->decode();
+        $this->system = Dever::db('manage/system')->find(['key' => 'sector']);
+        $this->sector = Dever::db($this->system['info_table'])->find($sector_id);
+        if (!$this->sector) {
             Dever::error('领域信息错误');
         }
         # 切换数据库
-        Dever::load('util', 'manage')->setAuth(self::$system, 'sector_user', self::$sector['id'], $account_id);
+        Dever::load(\Manage\Lib\Util::class)->setAuth($this->system, 'sector_user', $this->sector['id'], $account_id);
 
         # 初始化品牌
-        self::info($account_id, $place_id, $uid);
+        $this->info($account_id, $place_id, $uid);
 
         # 切换数据库
-        /*
-        self::$module = Dever::db('system_module', 'manage')->find(['key' => 'sector_place']);
-        Dever::load('util', 'manage')->setAuth(self::$system, self::$module['id'], self::$sector['id'], $place_id);
-        */
-        Dever::load('util', 'manage')->setAuth(self::$system, 'sector_place', self::$sector['id'], $place_id);
+        Dever::load(\Manage\Lib\Util::class)->setAuth($this->system, 'sector_place', $this->sector['id'], $place_id);
 
         # 查找销售来源
-        self::sales($sales_type, $sales_id);
+        $this->sales($sales_type, $sales_id);
+    }
+
+    # 生成访问码
+    public function encode($sector_id, $account_id, $place_id, $sales_type = 0, $sales_id = 0, $uid = 0)
+    {
+        return Dever::load(\Place\Lib\Info::class)->encode($sector_id, $account_id, $place_id, $sales_type, $sales_id, $uid);
+    }
+
+    # 解析访问码
+    public function decode()
+    {
+        $this->code = Dever::input('p');
+        return Dever::load(\Place\Lib\Info::class)->decode($this->code);
     }
 
     # 品牌信息
-    public static function info($account_id, $place_id, $uid)
+    public function info($account_id, $place_id, $uid)
     {
-        $account = Dever::db('user', 'sector')->find($account_id);
-        self::$info = Dever::db('info', 'place')->find($place_id, ['col' => 'id,code,name,info,logo,type,money_id,uid,score_name,`update`,content']);
-        if (!self::$info) {
+        $account = Dever::db('sector/user')->find($account_id);
+        $this->info = Dever::db('place/info')->find($place_id, ['col' => 'id,code,name,info,logo,type,money_id,uid,score_name,`update`,content']);
+        if (!$this->info) {
             Dever::error('信息有误');
         }
-        if (self::$info['uid'] != $account['id']) {
+        if ($this->uid != $account['id']) {
             Dever::error('信息有误');
         }
-        self::$info['supplier'] = $account['supplier'];
-        self::$info['parent_uid'] = $uid;
+        $this->info['supplier'] = $account['supplier'];
+        $this->info['parent_uid'] = $uid;
     }
 
     # 销售来源
-    public static function sales($sales_type, $sales_id)
+    public function sales($sales_type, $sales_id)
     {
-        self::$info['sales_type'] = $sales_type;
-        self::$info['sales_id'] = $sales_id;
+        $this->info['sales_type'] = $sales_type;
+        $this->info['sales_id'] = $sales_id;
         $sales = [];
         if ($sales_type && $sales_id) {
-            $sales = Dever::load('info', 'place_channel_sales')->get($sales_type, $sales_id);
+            $sales = Dever::load(\Psales\Lib\Info::class)->get($sales_type, $sales_id);
         } else {
             # 如果来源不存在，查找有没有实体店，如果有，根据用户当前定位，找最近的实体店，如果找不到，就找总店，如果总店也没有，就找平台店
             # 这个来源要保存到本地，永久有效，格式：1_1
             $location = Dever::input('location');
             if ($location) {
                 # 如果有定位，就要根据定位找最近的实体店
-                //self::$sales = Dever::load('offline', 'place_channel_sales')->get($location);
+                //$this->sales = Dever::load('offline', 'Psales')->get($location);
             }
         }
         if ($sales) {
-            self::$info['name'] = $sales['name'];
+            $this->info['name'] = $sales['name'];
             if ($sales['logo']) {
-                self::$info['logo'] = $sales['logo'];
+                $this->info['logo'] = $sales['logo'];
             }
             if ($sales['info']) {
-                self::$info['info'] = $sales['info'];
+                $this->info['info'] = $sales['info'];
             }
             if ($sales['content']) {
-                self::$info['content'] = $sales['content'];
+                $this->info['content'] = $sales['content'];
             }
         }
     }
 
     # 用户信息
-    public static function user($uid)
+    public function user($uid)
     {
-        self::$user = Dever::db('info', 'place_user')->find($uid, ['col' => 'id,parent_uid,name,mobile,password,avatar,sex,sign,type,sales_type,sales_id']);
-        if (self::$user) {
-            self::$uid = $uid;
-            //self::$user['mobile'] = \Dever\Helper\Str::hide(self::$user['mobile']);
-            if (self::$user['password']) {
-                self::$user['password'] = 1;
+        $this->user = Dever::db('puser/info')->find($uid, ['col' => 'id,parent_uid,name,mobile,password,avatar,sex,sign,type,sales_type,sales_id']);
+        if ($this->user) {
+            $this->uid = $uid;
+            //$this->user['mobile'] = \Dever\Helper\Str::hide($this->user['mobile']);
+            if ($this->user['password']) {
+                $this->user['password'] = 1;
             } else {
-                self::$user['password'] = 2;
+                $this->user['password'] = 2;
             }
         }
     }
 
     # 菜单信息
-    public static function nav()
+    public function nav()
     {
-        return Dever::db('nav', 'place_page')->select(['status' => 1], ['col' => 'id,name,type,type_id,icon,icon_select']);
+        return Dever::db('ppage/nav')->select(['status' => 1], ['col' => 'id,name,type,type_id,icon,icon_select']);
     }
 
     # 支付的货币信息
-    public static function money()
+    public function money()
     {
-        return Dever::db('money', 'sector')->find(self::$info['money_id'], ['col' => 'name,code,sign,unit']);
+        return Dever::db('sector/money')->find($this->info['money_id'], ['col' => 'name,code,sign,unit']);
     }
 
-    public static function result($data)
+    public function result($data)
     {
-        $data['place'] = self::$info;
-        $data['user'] = self::$user;
-        $data['nav'] = self::nav();
+        $data['place'] = $this->info;
+        $data['user'] = $this->user;
+        $data['nav'] = $this->nav();
         $data['nav_select'] = $data['nav'][0]['id'];
         return $data;
     }

src/place/channel/index.php

@@ -1,5 +1,5 @@
 <?php
-define('DEVER_APP_NAME', 'place_channel');
+define('DEVER_APP_NAME', 'Pchannel');
 define('DEVER_APP_LANG', '品牌渠道');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/channel/sales/lib/Info.php → src/place/channel/sales/app/Lib/Info.php

@@ -1,4 +1,4 @@
-<?php namespace Place_channel_sales\Lib;
+<?php namespace Psales\Lib;
 use Dever;
 class Info
 {
@@ -23,7 +23,7 @@ class Info
     public function get($type, $type_id)
     {
         $config = $this->getType($type);
-        $info = Dever::db($config['table'], 'place_channel_sales')->find($type_id);
+        $info = Dever::db($config['table'], 'Psales')->find($type_id);
         $info['type_name'] = $config['name'];
         return $info;
     }
@@ -32,7 +32,7 @@ class Info
     public function getInfo($type, $type_id)
     {
         $info = $this->get($type, $type_id);
-        $info['area_string'] = Dever::load('data', 'area')->string($info['area'], '-');
+        $info['area_string'] = Dever::load(\Area\Lib\Data::class)->string($info['area'], '-');
         return $info;
     }
 
@@ -43,7 +43,7 @@ class Info
         $list = $this->getType();
         foreach ($list as $k => $v) {
             $where = ['uid' => $uid];
-            $check = Dever::db($v['table'], 'place_channel_sales')->select($where, ['col' => 'id,name, ' . $v['id'] . ' as sales_type']);
+            $check = Dever::db($v['table'], 'Psales')->select($where, ['col' => 'id,name, ' . $v['id'] . ' as sales_type']);
             if ($check) {
                 $result = array_merge($check, $result);
             }

src/place/channel/sales/lib/Offline.php → src/place/channel/sales/app/Lib/Offline.php

@@ -1,4 +1,4 @@
-<?php namespace Place_channel_sales\Lib;
+<?php namespace Psales\Lib;
 use Dever;
 class Offline
 {

src/place/channel/sales/lib/Profit.php → src/place/channel/sales/app/Lib/Profit.php

@@ -1,4 +1,4 @@
-<?php namespace Place_channel_sales\Lib;
+<?php namespace Psales\Lib;
 use Dever;
 class Profit
 {
@@ -14,6 +14,6 @@ class Profit
         $data['sales_id'] = $sales_id;
         $data['amount'] = $amount;
         $data['money'] = $money;
-        return Dever::db('profit', 'place_channel_sales')->insert($data);
+        return Dever::db('psales/profit')->insert($data);
     }
 }

src/place/channel/sales/index.php

@@ -1,5 +1,5 @@
 <?php
-define('DEVER_APP_NAME', 'place_channel_sales');
+define('DEVER_APP_NAME', 'Psales');
 define('DEVER_APP_LANG', '品牌销售渠道');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../../boot.php');

src/place/channel/sales/manage/Lib/Cate.php

@@ -1,9 +1,9 @@
-<?php namespace Place_channel_sales\Manage\Lib;
+<?php namespace Psales\Manage\Lib;
 use Dever;
 class Cate
 {
     public function getData($type = 1)
     {
-        return Dever::db('cate', 'place_channel_sales')->select(['type' => $type, 'status' => 1]);
+        return Dever::db('psales/cate')->select(['type' => $type, 'status' => 1]);
     }
 }

src/place/channel/sales/manage/Lib/Info.php

@@ -1,4 +1,4 @@
-<?php namespace Place_channel_sales\Manage\Lib;
+<?php namespace Psales\Manage\Lib;
 use Dever;
 class Info
 {
@@ -6,7 +6,7 @@ class Info
     public function getInfo($type, $id)
     {
         if ($type && $id) {
-            $info = Dever::load('info', 'place_channel_sales')->get($type, $id);
+            $info = Dever::load(\Psales\Lib\Info::class)->get($type, $id);
             return $info['type_name'] . '-' . $info['name'];
         }
         return '平台';
@@ -16,11 +16,11 @@ class Info
     public function getList()
     {
         $result = [];
-        $type = Dever::load('info', 'place_channel_sales')->getType();
+        $type = Dever::load(\Psales\Lib\Info::class)->getType();
         if ($type) {
             foreach ($type as $k => $v) {
                 $where = ['status' => 1];
-                $data = Dever::db($v['table'], 'place_channel_sales')->select($where);
+                $data = Dever::db($v['table'], 'Psales')->select($where);
                 if ($data) {
                     $v['children'] = $data;
                     $result[] = $v;
@@ -35,7 +35,7 @@ class Info
     {
         return [
             'name' => '渠道信息',
-            'show' => 'Dever::call("place_channel_sales/manage/info.getInfo", [{sales_type}, {sales_id}])',
+            'show' => 'Dever::call("Psales/Manage/Lib/Info.getInfo", [{sales_type}, {sales_id}])',
             'truncate' => true,
         ];
     }
@@ -46,7 +46,7 @@ class Info
         return [
             'type' => 'select2',
             'name' => '渠道',
-            'option' => 'Dever::call("place_channel_sales/manage/info.getSearchList")',
+            'option' => 'Dever::call("Psales/Manage/Lib/Info.getSearchList")',
             'col' => 'sales_type,sales_id',
         ];
     }
@@ -56,9 +56,9 @@ class Info
     {
         $data = [];
         $data[] = ['id' => '0,0', 'name' => '平台'];
-        $type = Dever::load('info', 'place_channel_sales')->getType();
+        $type = Dever::load(\Psales\Lib\Info::class)->getType();
         foreach ($type as $v) {
-            $info = Dever::db($v['table'], 'place_channel_sales')->select(['status' => 1], ['col' => 'concat('.$v['id'].',",",id) as id, concat("'.$v['name'].'","-",name) as name']);
+            $info = Dever::db($v['table'], 'Psales')->select(['status' => 1], ['col' => 'concat('.$v['id'].',",",id) as id, concat("'.$v['name'].'","-",name) as name']);
             $data = array_merge($data, $info);
         }
         return $data;
@@ -67,8 +67,8 @@ class Info
     public function check($db, $data)
     {
         if (isset($data['mobile']) && $data['mobile'] && $data['id']) {
-            $table = Dever::load('info', 'place_channel_sales')->getType($data['sales_type'], 'table');
-            $info = Dever::db($table, 'place_channel_sales')->find($data['id']);
+            $table = Dever::load(\Psales\Lib\Info::class)->getType($data['sales_type'], 'table');
+            $info = Dever::db($table, 'Psales')->find($data['id']);
             $data['old_mobile'] = $info['mobile'];
             if ($info['mobile'] == $data['mobile']) {
                 # 无需修改
@@ -80,20 +80,20 @@ class Info
 
     public function createUser($db, $data)
     {
-        $extend = Dever::load('util', 'manage')->extend();
-        Dever::load('manage/place', 'place')->update($extend['data_id']);
+        $extend = Dever::load(\Manage\Lib\Util::class)->extend();
+        Dever::load(\Place\Manage\Lib\Place::class)->update($extend['data_id']);
         
-        $table = Dever::load('info', 'place_channel_sales')->getType($data['sales_type'], 'table');
+        $table = Dever::load(\Psales\Lib\Info::class)->getType($data['sales_type'], 'table');
         if (isset($data['mobile']) && $data['mobile']) {
             # 检测手机号是否被使用
             if ($data['id']) {
                 $list = ['offline', 'online', 'media', 'seller'];
                 foreach ($list as $k => $v) {
-                    $where = ['mobile' => $data['old_mobile']];
+                    $where = ['mobile' => $data['mobile']];
                     if ($v == $table) {
                         $where['id'] = ['!=', $data['id']];
                     }
-                    $check = Dever::db($v, 'place_channel_sales')->find($where);
+                    $check = Dever::db($v, 'Psales')->find($where);
                     if ($check) {
                         # 创建新用户
                         $data['uid'] = false;
@@ -101,10 +101,10 @@ class Info
                     }
                 }
             }
-            $user = Dever::load('manage/user', 'place_user')->createUser($data['sales_type'], $data['id'], $data['truename'], $data['mobile'], $data['uid']);
+            $user = Dever::load(\Puser\Manage\Lib\User::class)->createUser($data['sales_type'], $data['id'], $data['truename'], $data['mobile'], $data['uid']);
             if ($user) {
                 $update['uid'] = $user;
-                Dever::db($table, 'place_channel_sales')->update($data['id'], $update);
+                Dever::db($table, 'Psales')->update($data['id'], $update);
             }
         }
     }

src/place/channel/sales/manage/Lib/Offline.php

@@ -1,10 +1,10 @@
-<?php namespace Place_channel_sales\Manage\Lib;
+<?php namespace Psales\Manage\Lib;
 use Dever;
 class Offline
 {
     public function getAddress($area, $address)
     {
-        $result = Dever::load('data', 'area')->string($area, '');
+        $result = Dever::load(\Area\Lib\Data::class)->string($area, '');
         $result .= $address;
         return $result;
     }

src/place/channel/sales/manage/Lib/View.php

@@ -1,4 +1,4 @@
-<?php namespace Place_channel_sales\Manage\Lib;
+<?php namespace Psales\Manage\Lib;
 use Dever;
 class View
 {
@@ -14,8 +14,8 @@ class View
 
     public function get($info)
     {
-        $extend = Dever::load('util', 'manage')->extend();
-        $result = Dever::load('info', 'place')->share($extend['data_id'], $info['sales_type'], $info['id'], 0, true);
+        $extend = Dever::load(\Manage\Lib\Util::class)->extend();
+        $result = Dever::load(\Place\Lib\Info::class)->share($extend['data_id'], $info['sales_type'], $info['id'], 0, true);
         $content[] = [
             'type' => 'text',
             'name' => '文本',

src/place/channel/sales/manage/core.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'menu' => [
-        'place_channel_sales' => [
+        'psales' => [
             'parent'    => 'sector_place_channel',
             'name'      => '销售渠道',
             'icon'      => 'safe-2-line',
@@ -9,28 +9,28 @@ return [
         ],
 
         'offline' => [
-            'parent'    => 'place_channel_sales',
+            'parent'    => 'psales',
             'name'      => '实体店',
             'icon'      => 'home-8-line',
             'sort'      => '1',
         ],
 
         'online' => [
-            'parent'    => 'place_channel_sales',
+            'parent'    => 'psales',
             'name'      => '网店',
             'icon'      => 'shopping-bag-2-line',
             'sort'      => '2',
         ],
 
         'media' => [
-            'parent'    => 'place_channel_sales',
+            'parent'    => 'psales',
             'name'      => '自媒体',
             'icon'      => 'newspaper-line',
             'sort'      => '3',
         ],
 
         'cate' => [
-            'parent'    => 'place_channel_sales',
+            'parent'    => 'psales',
             'name'      => '分类',
             'icon'      => 'align-center',
             'sort'      => '100',