edit

src/place/act/index.php

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

src/place/benefit/lib/Scope.php

@@ -99,7 +99,7 @@ class Scope
             } else {
                 $result = Dever::load('info', 'place_role')->getName($scope);
                 if (!$result) {
-                    $result = '全部角色';
+                    $result = '全部身份';
                 }
             }
             $unit = '个';

src/place/benefit/lib/User.php

@@ -11,10 +11,10 @@ class User
         if ($user) {
             $result = Dever::load('scope', 'place_benefit')->check(1, $user, $type, $scope, $result);
         }
-        # 再验证角色等级是否有该权益
+        # 再验证身份等级是否有该权益
         $level = Dever::load('role', 'place_user')->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);

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

@@ -65,7 +65,7 @@ class Api
             if ($level == 1) {
                 $data = [
                     ['id' => 1, 'name' => '资源'],
-                    ['id' => 2, 'name' => '角色'],
+                    ['id' => 2, 'name' => '身份'],
                 ];
             } elseif ($level == 2) {
                 if ($parent == 1) {

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

@@ -2,7 +2,7 @@
 use Dever;
 class Scope
 {
-    # 更新角色权益
+    # 更新身份权益
     public function update($db, $data)
     {
         if ($data['select']) {
@@ -22,7 +22,7 @@ class Scope
             ['id' => 1, 'name' => '资源', 'children' => $channel],
         ];
         if ($role) {
-            $data[] = ['id' => 2, 'name' => '角色', 'children' => $role];
+            $data[] = ['id' => 2, 'name' => '身份', 'children' => $role];
         }
 
         # 积分充值
@@ -61,12 +61,12 @@ class Scope
                     }
                     $unit = '个';
                 } elseif ($value == 2) {
-                    $content = '范围内全部角色';
+                    $content = '范围内全部身份';
                     $name = Dever::load('info', 'place_role')->getName($v['value']);
                     if ($name) {
                         $v['name'] = '['.$name.']';
                     } else {
-                        $v['name'] = '[全部角色]';
+                        $v['name'] = '[全部身份]';
                     }
                     if ($v['ids']) {
                         $source = Dever::db('level', 'place_role')->columns(['id' => ['in', $v['ids']]], 'name');

src/place/benefit/manage/core.php

@@ -50,7 +50,7 @@ return [
 
         'score_action' => [
             'parent'    => 'place_benefit',
-            'name'      => '角色行为权益',
+            'name'      => '身份行为权益',
             'sort'      => '100',
             'show'      => 3
         ],
@@ -128,7 +128,7 @@ return [
 
         'role' => [
             'parent'    => 'place_benefit_role',
-            'name'      => '角色权益',
+            'name'      => '身份权益',
             'icon'      => 'surround-sound-line',
             'sort'      => '1',
         ],

src/place/benefit/manage/promotion.php

@@ -37,7 +37,7 @@ return [
 
         'field'    => [
             'name' => [
-                'tip' => '显示在角色等级介绍中',
+                'tip' => '显示在身份等级介绍中',
                 'maxlength' => 15,
                 'rules' => true,
             ],

src/place/benefit/manage/role.php

@@ -4,7 +4,7 @@ return [
     'list' => [
         'field'      => [
             'info_id' => [
-                'name' => '角色',
+                'name' => '身份',
                 'width' => '100px',
             ],
             'name' => [
@@ -51,7 +51,7 @@ return [
             ],
             'place_benefit/role_upgrade' => [
                 'name' => '固定权益',
-                'tip' => '无需用户主动领取<br />增加和删除权益将影响现有角色等级所有用户',
+                'tip' => '无需用户主动领取<br />增加和删除权益将影响现有身份等级所有用户',
                 'where'  => ['level_id' => 'id'],
             ],
 

src/place/benefit/manage/user.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'list' => [
-        'desc' => '用户权益列表仅展示用户已领取的权益，包括角色周期权益以及权益包里的权益，不包括角色固定权益',
+        'desc' => '用户权益列表仅展示用户已领取的权益，包括身份周期权益以及权益包里的权益，不包括身份固定权益',
         'field'      => [
             'uid' => Dever::call('place_user/manage/user.getInfo'),
             'type' => [

src/place/benefit/table/role_action.php

@@ -1,11 +1,11 @@
 <?php
 return [
-    'name' => '角色行为权益设置表',
+    'name' => '身份行为权益设置表',
     'partition' => 'Dever::call("manage/common.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'level_id'        => [
-            'name'      => '角色等级',
+            'name'      => '身份等级',
             'type'      => 'int(11)',
             'value'     => 'place_role/level',
         ],

src/place/benefit/table/role_period.php

@@ -1,11 +1,11 @@
 <?php
 return [
-    'name' => '角色周期奖励权益设置表',
+    'name' => '身份周期奖励权益设置表',
     'partition' => 'Dever::call("manage/common.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'level_id'        => [
-            'name'      => '角色等级',
+            'name'      => '身份等级',
             'type'      => 'int(11)',
             'value'     => 'place_role/level',
         ],

src/place/benefit/table/role_upgrade.php

@@ -1,11 +1,11 @@
 <?php
 return [
-    'name' => '角色升级奖励权益设置表',
+    'name' => '身份升级奖励权益设置表',
     'partition' => 'Dever::call("manage/common.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'level_id'        => [
-            'name'      => '角色等级',
+            'name'      => '身份等级',
             'type'      => 'int(11)',
             'value'     => 'place_role/level',
         ],

src/place/benefit/table/sales_rebate.php

@@ -15,12 +15,12 @@ return [
         ],
 
         'role_id' => [
-            'name'      => '角色ID',
+            'name'      => '身份ID',
             'type'      => 'int(11)',
         ],
 
         'role_level_id' => [
-            'name'      => '角色等级ID',
+            'name'      => '身份等级ID',
             'type'      => 'int(11)',
         ],
 

src/place/benefit/table/user_log.php

@@ -29,7 +29,7 @@ return [
             'type'      => 'tinyint(1)',
             'default'   => 1,
             'value'     => [
-                1 => '角色等级',
+                1 => '身份等级',
                 2 => '权益包',
                 10 => '后台发放',
             ],

src/place/boot.php

@@ -1,5 +1,5 @@
 <?php
-# place 身份入口
+# place 品牌入口
 class Place
 {
     public static $info;
@@ -11,13 +11,13 @@ class Place
     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')->decode($sector_id, $account_id, $place_id, $sales_type, $sales_id, $uid);
     }
 
-    # 解析入口码
+    # 解析访问码
     public static function decode()
     {
         self::$code = Dever::input('p');
@@ -36,7 +36,7 @@ class Place
         # 切换数据库
         Dever::load('common', 'manage')->setAuth(self::$system, 'sector_user', self::$sector['id'], $account_id);
 
-        # 初始化身份
+        # 初始化品牌
         self::info($account_id, $place_id, $uid);
 
         # 切换数据库
@@ -50,11 +50,11 @@ class Place
         self::sales($sales_type, $sales_id);
     }
 
-    # 身份信息
+    # 品牌信息
     public static 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,name,info,logo,type,money_id,uid,pay_account,score_name,`update`,content']);
+        self::$info = Dever::db('info', 'place')->find($place_id, ['col' => 'id,name,info,logo,type,money_id,uid,score_name,`update`,content']);
         if (!self::$info) {
             Dever::error('信息有误');
         }

src/place/channel/index.php

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

src/place/channel/market/index.php

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

src/place/channel/sales/index.php

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

src/place/channel/supply/index.php

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

src/place/interface/api/Benefit.php

@@ -29,6 +29,7 @@ class Benefit extends Core
     # 领取权益
     public function receive()
     {
+        $this->showBindMobile();
         $id = Dever::input('id');
         if (!$id) {
             Dever::error('权益不存在');

src/place/interface/api/Bind.php

@@ -45,18 +45,37 @@ class Bind extends Core
         $state = false;
         if ($merge) {
             # 把当前用户删掉，然后把用户之前的信息都合并过来
-            Dever::db('info', 'place_user')->update(Place::$uid, ['is_delete' => 1]);
-
+            $oldUid = Place::$uid;
+            $uid = $merge;
+            Dever::db('info', 'place_user')->update($oldUid, ['is_delete' => 1]);
+            $table = [
+                'place_user/account',
+                'place_user/address',
+                'place_user/coupon',
+                'place_user/coupon_log',
+                'place_user/gift',
+                'place_user/gift_log',
+                'place_user/perk',
+                'place_user/perk_log',
+                'place_user/search',
+                'place_act/collect',
+                'place_act/like',
+                'place_act/review',
+            ];
+            foreach ($table as $v) {
+                Dever::db($v)->update(['uid' => $oldUid], ['uid' => $uid]);
+            }
         } else {
             $state = Dever::db('info', 'place_user')->update(Place::$uid, ['mobile' => $mobile, 'type' => 1]);
 
             $user = Dever::db('info', 'place_user')->find(Place::$uid);
             Dever::load('info', 'place_role')->up(Place::$uid, $user['sales_type'], $user['sales_id']);
+            $uid = Place::$uid;
         }
         if (!$state) {
             Dever::error('绑定失败，请重试');
         }
-        return 'ok';
+        return Dever::load('main', 'place_interface')->result($uid, false);
     }
 
     # 获取微信手机号

src/place/interface/api/Main.php

@@ -49,7 +49,7 @@ class Main extends Core
         return $data;
     }
 
-    # 获取身份介绍
+    # 获取品牌介绍
     public function getContent()
     {
         $data['content'] = htmlspecialchars_decode(Place::$info['content']);
@@ -59,7 +59,7 @@ class Main extends Core
     # 获取个人中心首页需要的信息
     public function getUserHome()
     {
-        # 获取所有角色
+        # 获取所有身份
         $data['role'] = Dever::db('info', 'place_role')->select(['status' => 1], ['col' => 'id,name,info']);
         $data['role_info'] = [];
         if ($data['role']) {
@@ -88,7 +88,7 @@ class Main extends Core
         $pwd = Dever::input('pwd');
         if (!$pwd) {
             $code = Dever::input('code', 'is_numeric', '验证码');
-            Dever::load('template', 'msg')->check('reg_code', $mobile, $code);
+            //Dever::load('template', 'msg')->check('reg_code', $mobile, $code);
         }
         $invite = Dever::input('invite');
         $db = Dever::db('info', 'place_user');
@@ -102,7 +102,7 @@ class Main extends Core
             $uid = $user['id'];
             # 记录日志
             Dever::load('log', 'place_score')->action('登录')->add($uid);
-            # 升级初始角色等级
+            # 升级初始身份等级
             if ($user['type'] == 1) {
                 Dever::load('info', 'place_role')->up($uid, $user['sales_type'], $user['sales_id']);
             }
@@ -114,7 +114,7 @@ class Main extends Core
                     Dever::error('邀请码不存在');
                 }
             } else {
-                # 如果没有上级，从入口码里找：
+                # 如果没有上级，从访问码里找：
                 $parent_uid = Place::$info['parent_uid'];
                 /*  这里暂时不做
                 if (!$parent_uid && Place::$info['sales_type'] && Place::$info['sales_id']) {
@@ -181,15 +181,15 @@ class Main extends Core
     }
 
     # env = 2 => 'h5',3 => 'jsapi',4 => 'app',5 => '小程序',6 => 'pc',
-    private function result($uid, $openid = true)
+    public function result($uid, $openid = true)
     {
         $result['t'] = \Dever\Helper\Secure::login($uid);
         if ($openid) {
             # 获取openid
-            $platform = Dever::input('platform', 'is_string', '平台信息', 'wechat');
+            $platform = Dever::input('platform', 'is_string', '平台信息', 'weixin');
             $env = Dever::input('env', 'is_numeric', '环境信息', 3);
 
-            $result = Dever::load('util', 'api')->openid($platform, $env, $uid, $result);
+            $result = Dever::load('account', 'place')->openid(['key' => $platform], $env, $uid, $result);
             if (isset($result['openid'])) {
                 unset($result['openid']);
             }

src/place/interface/api/Order.php

@@ -36,6 +36,31 @@ class Order extends Core
         return 'ok';
     }
 
+    # 取消订单
+    public function cancel()
+    {
+        $info = $this->getInfo();
+        Dever::load('source/order', 'place_order')->cancel($info);
+        return 'ok';
+    }
+
+    # 再次支付
+    public function pay()
+    {
+        $info = $this->getInfo();
+        if ($info['pay_money_cash'] > 0) {
+            $result['pay'] = Dever::load('account', 'place')->pay($info);
+            if (isset($result['pay']['link']) && $result['pay']['link']) {
+                return $result;
+            }
+            $result['order_id'] = $info['id'];
+            $result['order_num'] = $info['order_num'];
+            return $result;
+        } else {
+            Dever::error('无需支付');
+        }
+    }
+
     # 申请退款
     public function refund()
     {

src/place/interface/api/Role.php

@@ -7,10 +7,10 @@ class Role extends Core
     protected $login = false;
     protected $entry = true;
 
-    # 角色信息
+    # 身份信息
     public function info($id = 0)
     {
-        $role_id = Dever::input('id', 'is_numeric', '角色ID', $id);
+        $role_id = Dever::input('id', 'is_numeric', '身份ID', $id);
         $data = Dever::load('info', 'place_role')->getData($role_id);
         return $data;
     }
@@ -21,7 +21,8 @@ class Role extends Core
         if (!Place::$uid) {
             $this->showLogin();
         }
-        $role_id = Dever::input('type_id', 'is_numeric', '角色');
+        $this->showBindMobile();
+        $role_id = Dever::input('type_id', 'is_numeric', '身份');
         $role = Dever::load('info', 'place_role')->getInfo($role_id);
         # 获取已经购买的
         $role['user'] = Dever::load('user', 'place_role')->getInfo($role_id);
@@ -30,10 +31,10 @@ class Role extends Core
         $level = Dever::input('detail', 'is_string', '等级');
         $level = Dever::json_decode($level);
         if (!$level) {
-            Dever::error('角色等级不存在');
+            Dever::error('身份等级不存在');
         }
         if (!isset($level[0])) {
-            Dever::error('角色等级不存在');
+            Dever::error('身份等级不存在');
         }
         $data = Dever::load('role/pay', 'place_order')->get($level, $role);
         return $data;

src/place/interface/api/Sales.php

@@ -43,9 +43,9 @@ class Sales extends Core
         $where['status'] = 1;
         $data['member'] = Dever::db('info', 'place_user')->count($this->data);
 
-        # 角色数
+        # 身份数
         $data['role'] = [];
-        # 角色列表
+        # 身份列表
         $role = Dever::db('info', 'place_role')->select(['status' => 1]);
         if ($role) {
             $roleWhere = $this->data;
@@ -109,10 +109,10 @@ class Sales extends Core
         return $data;
     }
 
-    # 店铺角色用户列表
+    # 店铺身份用户列表
     public function getRoleUser()
     {
-        $id = Dever::input('id', 'is_numeric', '角色');
+        $id = Dever::input('id', 'is_numeric', '身份');
         $this->data['info_id'] = $id;
         $this->data['status'] = 1;
         $data['info'] = $info = Dever::db('info', 'place_role')->find(['id' => $id, 'status' => 1], ['col' => 'id,name,info,score_id']);

src/place/interface/api/Score.php

@@ -56,6 +56,7 @@ class Score extends Core
     public function rechargeConfirm()
     {
         $data = $this->info();
+        $this->showBindMobile();
         $recharge_id = Dever::input('recharge_id');
         $number = Dever::input('number');
         if ($data['info']['recharge'] != 1) {
@@ -95,6 +96,7 @@ class Score extends Core
     public function exchangeAct()
     {
         $data = $this->info();
+        $this->showBindMobile();
         $config = Dever::input('config', 'is_numeric', '目标积分');
         $number = Dever::input('number', 'is_numeric', '兑换数量');
         if ($data['info']['exchange'] != 1) {
@@ -126,6 +128,7 @@ class Score extends Core
     public function withdrawAct()
     {
         $data = $this->info();
+        $this->showBindMobile();
         $config = Dever::input('config', 'is_numeric', '提现账户');
         $number = Dever::input('number', 'is_numeric', '提现数值');
         if ($data['info']['withdraw'] != 1) {

src/place/interface/api/Source.php

@@ -126,6 +126,15 @@ class Source extends Core
             'name'  => $cate['name'],
             'desc'  => $cate['desc'],
         ];
+
+        $channel = Dever::load('channel', 'place_source')->getInfo($cate['channel_id']);
+
+        $data['channel'] = [
+            'id'    => $channel['id'],
+            'name'  => $channel['name'],
+            'desc'  => $channel['desc'],
+        ];
+
         $data['child'] = [];
         if ($cate['parent_id'] == 0) {
             $cate_id = $cate['id'];
@@ -230,6 +239,7 @@ class Source extends Core
         if (!Place::$uid) {
             $this->showLogin();
         }
+        $this->showBindMobile();
         $cate_id = Dever::input('type_id', 'is_numeric', '分类ID');
         $cate = Dever::load('cate', 'place_source')->getInfo($cate_id);
 
@@ -252,13 +262,7 @@ class Source extends Core
         $this->payConfirm();
         return Dever::load('source/pay', 'place_order')->act();
     }
-
-    # 重新支付
-    public function repay()
-    {
-
-    }
-
+    
     # 资源评论列表
     public function getReviewList()
     {

src/place/interface/api/User.php

@@ -24,7 +24,7 @@ class User extends Core
 
         $data['role'] = [];
         $role = Dever::db('info', 'place_role')->select(['status' => 1], ['col' => 'id,name,info']);
-        # 获取用户的角色
+        # 获取用户的身份
         $user_role = Dever::load('user', 'place_role')->getList(Place::$uid);
         $data['role_info'] = [];
         if ($role) {

src/place/interface/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place_interface');
-define('DEVER_APP_LANG', '身份对外接口');
+define('DEVER_APP_LANG', '品牌对外接口');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/interface/lib/Core.php

@@ -41,6 +41,20 @@ class Core
         Dever::error('请先登录', -4);
     }
 
+    protected function showBindMobile()
+    {
+        if (Place::$user['type'] == 2) {
+            Dever::error('您需要绑定手机号才能继续操作', -5);
+        }
+    }
+
+    protected function showBindEmail()
+    {
+        if (Place::$user['type'] == 2) {
+            Dever::error('您需要绑定邮箱才能继续操作', -6);
+        }
+    }
+
     # 获取要更新的数据版本号
     public function getUpdate()
     {

src/place/order/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place_order');
-define('DEVER_APP_LANG', '身份订单');
+define('DEVER_APP_LANG', '品牌订单');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/order/lib/Pay.php

@@ -238,6 +238,9 @@ class Pay
         if (Place::$user['parent_uid'] && Place::$user['parent_uid'] > 0) {
             $this->order['parent_uid'] = Place::$user['parent_uid'];
         }
+        if (is_array($this->order['name'])) {
+            $this->order['name'] = implode('、', $this->order['name']);
+        }
         $this->order['order_num'] = Dever::load('util', 'api')->createNumber($prefix, $table);
         $this->order['notify'] = $table . '/pay.notify|' . Dever::input('p') . '|' . $this->order['order_num'];
         $this->order['buy_info'] = Dever::input('remark');
@@ -246,19 +249,15 @@ class Pay
 
         $result = [];
         if ($this->order['pay_money_cash'] > 0) {
-            /*
             $result['pay'] = Dever::load('account', 'place')->pay($this->order);
             if (isset($result['pay']['link']) && $result['pay']['link']) {
                 return $result;
             }
-            */
-            $result['pay'] = true;
         } else {
             $result['pay'] = true;
         }
         if ($result['pay']) {
             $result['order_id'] = Dever::db($table)->insert($this->order);
-
             if ($result['order_id']) {
                 $result['order_num'] = $this->order['order_num'];
                 $this->success($result['order_id']);
@@ -333,7 +332,7 @@ class Pay
     # 支付回调
     public function notify($place, $order_num, $status, $body = [])
     {
-        Dever::input('authorization', 'is_string', '入口码', $place);
+        Dever::input('authorization', 'is_string', '访问码', $place);
         $order = Dever::db($this->type, 'place_order')->find(['order_num' => $order_num]);
         if ($order && $order['status'] == 1) {
             if ($status == 1) {

src/place/order/lib/Source/Cart.php

@@ -44,7 +44,7 @@ class Cart
 
         $info = Dever::db('info', 'place_source')->find($source_id);
         if (!$info) {
-            Dever::error('商品不存在');
+            Dever::error('资源不存在');
         }
 
         $stock = Dever::load('info', 'place_stock')->yue($data['source_id'], $data['sku_id']);
@@ -80,7 +80,7 @@ class Cart
         return $this->getList();
     }
 
-    # 删除商品
+    # 删除资源
     public function delete($uid, $source_id, $sku_id)
     {
         $data['uid'] = $uid;
@@ -99,7 +99,7 @@ class Cart
 
     public function confirm($uid)
     {
-        //$id = Dever::input('ids', 'is_string', '请选择商品');
+        //$id = Dever::input('ids', 'is_string', '请选择资源');
         $where['uid'] = $uid;
         $where['status'] = 1;
         $data = Dever::db('source_cart', 'place_order')->select($where);
@@ -158,7 +158,7 @@ class Cart
             $result['detail'] = $data;
             return $result;
         } else {
-            Dever::error('请选择商品');
+            Dever::error('请选择资源');
         }
     }
 }

src/place/order/lib/Source/Order.php

@@ -30,7 +30,7 @@ class Order
             }
         }
         $set['num'] = 10;
-        $set['col'] = 'id,status,cdate,score_id,num,refund_status,review_status,cash,method';
+        $set['col'] = 'id,status,order_num,cdate,score_id,num,refund_status,review_status,cash,method';
         $data = Dever::db('source', 'place_order')->select($where, $set);
         if ($data) {
             foreach ($data as &$v) {
@@ -55,6 +55,7 @@ class Order
             } else {
                 $info['time'] = $m - $info['time'];
             }
+            $info['time'] = $info['time'] * 1000;
         }
         $info['score'] = Dever::load('info', 'place_score')->get($info['score_id']);
         $info['detail'] = $this->getDetail($info);
@@ -63,7 +64,7 @@ class Order
         return $info;
     }
 
-    # 获取订单里每个商品
+    # 获取订单里每个资源
     public function getDetail($info)
     {
         $result = Dever::db('source_detail', 'place_order')->select(['order_id' => $info['id']], ['col' => 'id,cash,status,name,sku_name,pic,num,source_id,source_type']);

src/place/order/lib/Source/Pay.php

@@ -65,6 +65,9 @@ class Pay extends Core
                 }
             }
         }
+        if (count($this->detail) < 3) {
+            $this->order['name'][$source['id']] = $source['name'];
+        }
         $this->order['cash'] += $detail['price'] * $detail['buy_num'];
         $this->order['num'] += $detail['buy_num'];
     }

src/place/order/manage/Lib/Source/Stat.php

@@ -23,7 +23,7 @@ class Stat
             # 中台
         } else {
             if ($config['module_id'] == 5) {
-                # 身份 对应place_info里的id
+                # 品牌 对应place_info里的id
                 $data = $this->getConsolePlace($config['data_id'], $data);
             } elseif ($config['module_id'] == 4) {
                 # 账户 对应place_user里的id

src/place/order/manage/Lib/Source/View.php

@@ -434,7 +434,7 @@ class View
             'head' => [
                 [
                     'key' => 'utype',
-                    'name' => '申请人身份',
+                    'name' => '申请人品牌',
                     'fixed' => 'fixed',
                     //'width' => '80px',
                 ],
@@ -592,7 +592,7 @@ class View
             'head' => [
                 [
                     'key' => 'utype',
-                    'name' => '身份',
+                    'name' => '品牌',
                     'fixed' => 'fixed',
                     //'width' => '80px',
                 ],

src/place/order/manage/core.php

@@ -8,12 +8,14 @@ return [
             'sort'      => '1',
         ],
 
+        /*
         'source_stat' => [
             'parent'    => 'sector_place_order',
             'name'      => '订单统计',
             'sort'      => '6',
             'path'      => 'diy',
         ],
+        */
 
         /*
         'pdf' => [
@@ -87,7 +89,7 @@ return [
 
         'role' => [
             'parent'    => 'sector_place_order',
-            'name'      => '角色订单',
+            'name'      => '身份订单',
             'icon'      => 'shield-user-line',
             'sort'      => '2',
         ],

src/place/order/table/role.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '角色等级支付订单表',
+    'name' => '身份等级支付订单表',
     'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'uid'       => [

src/place/order/table/role_detail.php

@@ -1,10 +1,10 @@
 <?php
 return [
-    'name' => '角色等级支付订单明细表',
+    'name' => '身份等级支付订单明细表',
     'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'role_id' => [
-            'name'      => '角色',
+            'name'      => '身份',
             'type'      => 'int(11)',
         ],
 

src/place/order/table/role_log.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '角色订单日志表',
+    'name' => '身份订单日志表',
     'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'order_id'       => [

src/place/role/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place_role');
-define('DEVER_APP_LANG', '角色');
+define('DEVER_APP_LANG', '身份');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/role/lib/Info.php

@@ -25,12 +25,12 @@ class Info
         return $data;
     }
 
-    # 获取角色信息
+    # 获取身份信息
     public function getInfo($id)
     {
         $info = Dever::db('info', 'place_role')->find(['id' => $id, 'status' => 1], ['col' => 'id,name,info,score_id']);
         if (!$info) {
-            Dever::error('角色信息错误');
+            Dever::error('身份信息错误');
         }
         $info['score'] = Dever::load('info', 'place_score')->get($info['score_id']);
         //$info['rebate'] = Dever::load('rebate', 'place_score')->get(4, $info['id']);

src/place/role/lib/Price.php

@@ -47,15 +47,15 @@ class Price
         # 获取促销描述
         $info['promotion_text'] = '';
         if ($promotion) {
-            $info['promotion_text'] = '<table class="rich-table">';
-            $info['promotion_text'] .= '<tr><td>原价<td><td><td><td>'.$info['m_price_text'].'<td></tr>';
+            $info['promotion_text'] = '<table class="rich-table" style="border-collapse: collapse; text-align: center; width: 100%;">';
+            $info['promotion_text'] .= '<tr><td>原价</td><td></td><td>'.$info['m_price_text'].'</td></tr>';
             foreach ($promotion as $k => $v) {
                 $text = Dever::load('info', 'place_score')->getText($v['price'], $set['score']);
                 $type = '<td><td>';
                 if ($v['type'] != 3) {
-                    $type = '<td>'.$v['value'].'<td>';
+                    $type = '<td>'.$v['value'].'</td>';
                 }
-                $info['promotion_text'] .= '<tr><td>'.$v['name'].'<td>'.$type.'<td>'.$text.'<td></tr>';
+                $info['promotion_text'] .= '<tr><td>'.$v['name'].'</td>'.$type.'<td>'.$text.'</td></tr>';
             }
             $info['promotion_text'] .= '</table>';
         }

src/place/role/lib/User.php

@@ -3,7 +3,7 @@ use Dever;
 use Place;
 class User
 {
-    # 检测是否开通相关角色
+    # 检测是否开通相关身份
     public function check($uid, $info_id, $level_id)
     {
         $info = Dever::db('user', 'place_role')->find(['uid' => $uid, 'info_id' => $info_id, 'level_id' => $level_id, 'status' => 1]);

src/place/role/manage/core.php

@@ -1,11 +1,11 @@
 <?php
 return [
     'menu' => [
-        # 某个账户下角色设置
+        # 某个账户下身份设置
         /*
         'set_role_manage' => [
             'parent'    => 'sector_place_set',
-            'name'      => '角色配置',
+            'name'      => '身份配置',
             'icon'      => 'folder-user-line',
             'sort'      => '101',
         ],
@@ -13,14 +13,14 @@ return [
 
         'role' => [
             'parent'    => 'set_manage',
-            'name'      => '角色设置',
+            'name'      => '身份设置',
             'icon'      => 'user-2-line',
             'sort'      => '2',
         ],
 
         'level' => [
             'parent'    => 'set_manage',
-            'name'      => '角色等级',
+            'name'      => '身份等级',
             'icon'      => 'user-2-line',
             'sort'      => '100',
             'show'      => 3,
@@ -28,7 +28,7 @@ return [
 
         'user_role' => [
             'parent'    => 'place_user_list',
-            'name'      => '用户角色',
+            'name'      => '用户身份',
             'sort'      => '2',
         ],
     ],

src/place/role/manage/role.php

@@ -42,7 +42,7 @@ return [
             ],
             'score_id' => [
                 'rules' => true,
-                'tip' => '购买该角色所需的积分',
+                'tip' => '购买该身份所需的积分',
             ],
         ],
     ],

src/place/role/table/info.php

@@ -1,11 +1,11 @@
 <?php
 return [
-    'name' => '角色表',
+    'name' => '身份表',
     'partition' => 'Dever::call("manage/common.system")',
     'order' => 'sort asc,id asc',
     'struct' => [
         'name' => [
-            'name'      => '角色名称',
+            'name'      => '身份名称',
             'type'      => 'varchar(32)',
         ],
         'info' => [

src/place/role/table/level.php

@@ -1,11 +1,11 @@
 <?php
 return [
-    'name' => '角色等级设置',
+    'name' => '身份等级设置',
     'partition' => 'Dever::call("manage/common.system")',
     'order' => 'info_id asc,level asc,id asc',
     'struct' => [
         'info_id'        => [
-            'name'      => '角色',
+            'name'      => '身份',
             'type'      => 'int(11)',
             'value'     => 'place_role/info',
         ],

src/place/role/table/user.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '用户角色关联表',
+    'name' => '用户身份关联表',
     'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'uid'       => [
@@ -18,13 +18,13 @@ return [
             'type'      => 'int(11)',
         ],
         'info_id'        => [
-            'name'      => '角色',
+            'name'      => '身份',
             'type'      => 'int(11)',
             'value'     => 'place_role/info',
         ],
 
         'level_id'        => [
-            'name'      => '角色等级',
+            'name'      => '身份等级',
             'type'      => 'int(11)',
             'value'     => 'place_role/level',
         ],

src/place/score/lib/Info.php

@@ -21,7 +21,7 @@ class Info
         }
         $info['exp_tip'] = $this->getExpTip($info);
         $info['recharge'] = $info['withdraw'] = $info['exchange'] = 2;
-        # 按照角色获取积分规则
+        # 按照身份获取积分规则
         $info = Dever::load('item', 'place_benefit')->load('score')->get(Place::$uid, $info);
         $info['button'] = 1;
         if ($info['recharge'] == 1 && $info['exchange'] == 1 && $info['withdraw'] == 1) {

src/place/set/api/Tool.php

@@ -2,16 +2,16 @@
 use Dever;
 class Tool
 {
-    # 根据身份码获取入口
+    # 根据访问码获取入口
     public function code()
     {
         $code = Dever::input('code');
         if (!$code) {
-            Dever::error('请输入身份码');
+            Dever::error('请输入访问码');
         }
         $code = Dever::db('code', 'place')->find(['code' => $code]);
         if (!$code) {
-            Dever::error('身份码错误');
+            Dever::error('访问码错误');
         }
         $result = Dever::load('info', 'place')->encode($code['sector_id'], $code['user_id'], $code['place_id']);
         return $result;

src/place/set/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place');
-define('DEVER_APP_LANG', '身份');
+define('DEVER_APP_LANG', '品牌');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/set/lib/Account.php

@@ -6,47 +6,57 @@ class Account
     # 下单操作
     public function pay($order)
     {
-        $account = Dever::input('account', 'is_string', '账户', 'wechat');
+        $account = Dever::input('platform', 'is_string', '账户', 'weixin');
         $env = Dever::input('env', 'is_numeric', '运行环境', 3);
-        $result = Dever::load('util', 'api')->openid($account, $env, Place::$uid);
-        if (isset($result['openid'])) {
-            $order['openid'] = $result['openid'];
-        } elseif (isset($result['link'])) {
+        $result = $this->openid(['key' => $account], $env, Place::$uid);
+        if (isset($result['link'])) {
             return $result;
         }
 
-        $account = 'pay_' . $account;
-        $project = 'api';
-
-        if (Place::$info['pay_account'] > 0) {
-            $info = $this->getInfo(Place::$info['pay_account']);
-            if ($info) {
-                $account = $info;
-                $project = 'place';
-                $cert = Dever::db('account_cert', 'place')->find(['account_id' => $info['id'], 'platform_cert_id' => 2]);
-                if (!$cert || ($cert && $cert['edate'] <= time())) {
-                    Dever::load('account', 'api')->run($account, 'task', [], 1, 'run', $project);
-                }
-            }
+        $account = $this->getInfo(['key' => 'pay_' . $account]);
+        if (!$account) {
+            Dever::error('支付账户配置错误');
+        }
+        $cert = Dever::db('account_cert', 'place')->find(['account_id' => $account['id'], 'platform_cert_id' => 2]);
+        if (!$cert || ($cert && $cert['edate'] <= time())) {
+            Dever::load('account', 'api')->run($account, 'task', [], 1, 'run', 'place');
         }
 
+        $order['openid'] = $result['openid'];
         $order['cash'] = $order['pay_money_cash']*100;
         $order['time_expire'] = time() + 3600;
 
-        return Dever::load('account', 'api')->run($account, 'order', $order, $env, 'run', $project);
+        return Dever::load('account', 'api')->run($account, 'order', $order, $env, 'run', 'place');
+    }
+
+    # 获取openid
+    public function openid($account, $env, $uid, $result = [])
+    {
+        $account = $this->getInfo($account);
+        return Dever::load('util', 'api')->openid($account, $env, $uid, $result, 'place');
+    }
+
+    # 获取小程序码
+    # version = develop/release/trial
+    public function getAppletCode($account, $env, $scene, $page, $version = 'develop')
+    {
+        $token = Dever::load('util', 'api')->token($account, $env, 'place');
+        if ($token) {
+            $param['access_token'] = $token;
+            $param['scene'] = $scene;
+            $param['page'] = $page;
+            $param['env_version'] = $version;
+            $data = Dever::load('account', 'api')->run($account, 'applet_code', $param, 1, 'run', 'place');
+            print_r($data);die;
+        }
     }
 
     # 获取账户信息
-    public function getInfo($id)
+    public function getInfo($where)
     {
-        $info = Dever::db('account', 'place')->find($id);
+        $info = Dever::db('account', 'place')->find($where);
         if ($info) {
-            if ($info['type'] == 1) {
-                $key = 'pay_wechat';
-            } else {
-                Dever::error('错误信息');
-            }
-            $account = Dever::db('account', 'api')->find(['key' => $key]);
+            $account = Dever::db('account', 'api')->find(['key' => $info['key']]);
             $info['app_id'] = $account['app_id'];
             $info['platform_id'] = $account['platform_id'];
             return $info;

src/place/set/lib/Info.php

@@ -20,7 +20,7 @@ class Info
         $result = [];
         $info = Dever::db('info', 'place')->find($place_id);
         if ($info) {
-            # code 第一个是领域id，第二个账户id，第三个是身份id
+            # code 第一个是领域id，第二个账户id，第三个是品牌id
             if ($manage) {
                 # 后台生成
                 $extend = Dever::load('common', 'manage')->extend();
@@ -37,7 +37,7 @@ class Info
             $host = 'http://localhost:8080/#';
             $path = '/pages/main?p=' . $code;
 
-            # 生成各个端口的身份入口：
+            # 生成各个端口的品牌入口：
             $result['code'] = $code;
 
             # 网页版
@@ -48,6 +48,8 @@ class Info
             # h5二维码码
             $result['h5_ercode'] = '';
             
+
+            $code = Dever::load('account', 'place')->getAppletCode('weixin', 5, 'code=' . $info['code'] . '&jump=', 'pages/main', 'develop');
             # 小程序码
             $result['applet'] = [
                 # 微信小程序
@@ -84,12 +86,12 @@ class Info
     {
         $code = Secure::decode($code);
         if (!$code) {
-            Dever::error('身份码错误');
+            Dever::error('访问码错误');
         }
         return explode('-', $code);
     }
 
-    # 更新个人身份的版本号
+    # 更新个人品牌的版本号
     public function update($id)
     {
         return Dever::db('info', 'place')->update($id, ['update' => time()]);

src/place/set/manage/Lib/Api.php

@@ -27,7 +27,7 @@ class Api
             if ($level == 1) {
                 $data = [
                     ['id' => 1, 'name' => '资源'],
-                    ['id' => 2, 'name' => '角色'],
+                    ['id' => 2, 'name' => '身份'],
                 ];
             } elseif ($level == 2) {
                 if ($parent == 1) {

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

@@ -2,7 +2,7 @@
 use Dever;
 class Code
 {
-    # 检测身份码
+    # 检测访问码
     public function check($db, $data)
     {
         if (isset($data['id']) && $data['id']) {
@@ -19,13 +19,13 @@ class Code
                 if (isset($data['id']) && $data['id'] == $code['id']) {
                     return $data;
                 }
-                Dever::error('身份码已存在');
+                Dever::error('访问码已存在');
             }
         }
         return $data;
     }
 
-    # 更新身份码
+    # 更新访问码
     public function update($db, $data)
     {
         if (isset($data['code']) && $data['code']) {

src/place/set/manage/Lib/Place.php

@@ -2,13 +2,13 @@
 use Dever;
 class Place
 {
-    # 更新个人身份的版本号
+    # 更新个人品牌的版本号
     public function update($id)
     {
         return Dever::load('info', 'place')->update($id);
     }
 
-    # 获取身份的树形列表
+    # 获取品牌的树形列表
     public function getTree()
     {
         $extend = Dever::load('common', 'manage')->extend();
@@ -16,7 +16,7 @@ class Place
         $result = [];
         $result[] = [
             'id' => 'root',
-            'name' => '身份',
+            'name' => '品牌',
             'children' => [$data],
         ];
         return $result;

src/place/set/manage/Lib/Profit.php

@@ -2,7 +2,7 @@
 use Dever;
 class Profit
 {
-    # 更新角色权益
+    # 更新身份权益
     public function update($db, $data)
     {
         if ($data['select']) {
@@ -26,7 +26,7 @@ class Profit
             ['id' => 1, 'name' => '资源', 'children' => $channel],
         ];
         if ($role) {
-            $data[] = ['id' => 2, 'name' => '角色', 'children' => $role];
+            $data[] = ['id' => 2, 'name' => '身份', 'children' => $role];
         }
         return $data;
     }

src/place/set/manage/account.php

@@ -3,7 +3,7 @@ $id = Dever::input('id');
 $show = false;
 $account_setting = [];
 if ($id) {
-    $account = Dever::load('account', 'place')->getInfo($id);
+    $account = Dever::load('account', 'place')->getInfo(['id' => $id]);
     $setting = Dever::db('platform_setting', 'api')->select(['platform_id' => $account['platform_id']]);
     if ($setting) {
         $show = true;
@@ -12,46 +12,40 @@ if ($id) {
         }
     }
 }
+/* 不再需要定位到当前登录账户
 $extend = Dever::load('common', 'manage')->extend();
 $uid = $extend['data_id'];
+*/
 return [
     'list' => [
-        'where' => ['uid' => $uid],
         'field'      => [
             'id',
             'name',
-            'type',
             'cdate',
         ],
         'button' => [
-            '新增' => ['fastadd', ['field' => 'uid,name,type','uid' => $uid]],
+            //'新增' => ['fastadd', ['field' => 'name,key']],
         ],
         'data_button' => [
-            '设置' => ['edit', 'uid,name,place/account_setting'],
+            '设置' => ['fastedit', 'name,place/account_setting'],
             '证书' => ['route', [
-                'path' => 'sector_place/account_cert',
+                'path' => 'set_manage/account_cert',
                 'param' => [
-                    'set' => ['account_id' => 'id', 'menu' => 'sector_place/account', 'parent' => 'sector_place/account'],
+                    'set' => ['account_id' => 'id', 'menu' => 'set_manage/account', 'parent' => 'set_manage/account'],
                 ],
             ]],
         ],
         'search' => [
             'name',
-            'type',
         ],
     ],
     'update' => [
         'field'    => [
-            'uid' => [
-                'type' => 'hidden',
-            ],
             'name' => [
                 'rules' => true,
             ],
-            'type' => [
-                'type' => 'radio',
+            'key' => [
                 'rules' => true,
-                'desc' => '【保存后不能更改】',
             ],
             'place/account_setting' => [
                 'show' => $show,

src/place/set/manage/core.php

@@ -11,34 +11,19 @@ return [
 
         'sector_place' => [
             'parent'    => 'sector_user',
-            'name'      => '身份管理',
+            'name'      => '品牌管理',
             'icon'      => 'group-2-line',
             'sort'      => '100',
         ],
 
         'place' => [
             'parent'    => 'sector_place',
-            'name'      => '身份列表',
+            'name'      => '品牌列表',
             'icon'      => 'apps-line',
             'sort'      => '1',
         ],
 
-        'account' => [
-            'parent'    => 'sector_place',
-            'name'      => '支付账户',
-            'icon'      => 'contacts-line',
-            'sort'      => '2',
-        ],
-
-        'account_cert' => [
-            'parent'    => 'sector_place',
-            'name'      => '账户证书',
-            'icon'      => 'contacts-line',
-            'sort'      => '3',
-            'show'      => 3,
-        ],
-
-        # 某个账户下身份
+        # 某个账户下品牌
         'set_manage' => [
             'parent'    => 'sector_place_set',
             'name'      => '基础配置',
@@ -48,7 +33,7 @@ return [
 
         'info' => [
             'parent'    => 'set_manage',
-            'name'      => '身份设置',
+            'name'      => '品牌设置',
             'icon'      => 'file-user-line',
             'sort'      => '1',
             'path'      => 'update',
@@ -60,5 +45,20 @@ return [
             'icon'      => 'honor-of-kings-line',
             'sort'      => '4',
         ],
+
+        'account' => [
+            'parent'    => 'set_manage',
+            'name'      => '万接设置',
+            'icon'      => 'contacts-line',
+            'sort'      => '5',
+        ],
+
+        'account_cert' => [
+            'parent'    => 'set_manage',
+            'name'      => '万接证书',
+            'icon'      => 'contacts-line',
+            'sort'      => '100',
+            'show'      => 3,
+        ],
     ],
 ];

src/place/set/manage/info.php

@@ -34,7 +34,7 @@ $config['update']['column'] = [
     'where' => 'id',
     'hidden' => true,
 ];
-$config['update']['field']['pay_account']['option'] = 'Dever::call("place/manage/account.getList", '.$uid.')';
+//$config['update']['field']['pay_account']['option'] = 'Dever::call("place/manage/account.getList", '.$uid.')';
 return [
     'source' => 'place/info',
     'list' => [

src/place/set/manage/place.php

@@ -17,7 +17,7 @@ return [
             ],
         ],
         'button' => [
-            '新增' => ['fastadd', ['field' => 'uid,name,code,pay_account', 'uid' => $uid]],
+            '新增' => ['fastadd', ['field' => 'uid,name,code', 'uid' => $uid]],
         ],
         'data_button' => [
             //'编辑' => 'edit',
@@ -30,10 +30,10 @@ return [
     'update' => [
         # 更新后是否更新后台用户登录信息，用于修改后台常用的配置
         'upAdmin' => true,
-        'desc' => '修改身份信息请切换到相应身份后到配置中修改',
+        'desc' => '修改品牌信息请切换到相应品牌后到配置中修改',
         'tab' => [
             '基本信息' => 'ercode,uid,name,info,code,password,price,logo,bg,content',
-            '支付设置' => 'pay_account,money_id',
+            '支付设置' => 'money_id',
         ],
         'field'    => [
             /*
@@ -53,12 +53,7 @@ return [
             ],
             'code' => [
                 //'rules' => true,
-                'desc' => '设置身份码之后，用户将可以通过身份码快速进入，身份码不能重复',
-            ],
-            'pay_account' => [
-                'rules' => true,
-                'type' => 'select',
-                'option'    => 'Dever::call("place/manage/account.getList")',
+                'desc' => '设置访问码之后，用户将可以通过访问码快速进入，访问码不能重复',
             ],
 
             'money_id' => [
@@ -96,7 +91,7 @@ return [
                 'style' => 'pic',
             ],*/
             'content' => [
-                'tip' => '身份介绍',
+                'tip' => '品牌介绍',
                 'type' => 'editor',
                 'editorMenu' => [
                     'uploadImage' => 1,

src/place/set/table/account.php

@@ -1,25 +1,31 @@
 <?php
 return [
-    'name' => '支付账户管理',
-    'partition' => 'Dever::call("manage/common.system", [false, false])',
+    'name' => '万接账户管理',
+    'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'name'      => [
             'type'      => 'varchar(32)',
             'name'      => '账户名称',
         ],
 
-        'uid' => [
-            'name'      => '用户ID',
-            'type'      => 'int(11)',
+        'key'       => [
+            'type'      => 'varchar(32)',
+            'name'      => '账户标识',
         ],
+    ],
 
-        'type' => [
-            'name'      => '类型',
-            'type'      => 'tinyint(1)',
-            'default'   => 1,
-            'value'     => [
-                1 => '微信支付',
-            ],
+    'default' => [
+        'field' => 'name,`key`,cdate',
+        'value' => [
+            '"阿里云","aliyun",' . DEVER_TIME,
+            '"阿里云云市场","aliyun_market",' . DEVER_TIME,
+            '"微信平台","weixin",' . DEVER_TIME,
+            '"微信支付","pay_weixin",' . DEVER_TIME,
         ],
+        'num' => 1,
+    ],
+
+    'index' => [
+        'search' => '`key`',
     ],
 ];

src/place/set/table/account_cert.php

@@ -2,7 +2,7 @@
 
 return [
     'name' => '账户证书设置',
-    'partition' => 'Dever::call("manage/common.system", [false, false])',
+    'partition' => 'Dever::call("manage/common.system")',
     'order' => 'edate desc, id asc',
     'struct' => [
         'account_id'        => [

src/place/set/table/account_setting.php

@@ -2,7 +2,7 @@
 
 return [
     'name' => '账户设置',
-    'partition' => 'Dever::call("manage/common.system", [false, false])',
+    'partition' => 'Dever::call("manage/common.system")',
     'order' => 'id asc',
     'struct' => [
         'account_id'        => [

src/place/set/table/code.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '身份码记录表',
+    'name' => '访问码记录表',
     'struct' => [
         'sector_id' => [
             'name'      => '领域',
@@ -18,12 +18,12 @@ return [
         ],
 
         'place_id' => [
-            'name'      => '领域身份',
+            'name'      => '领域品牌',
             'type'      => 'int(11)',
         ],
 
         'code' => [
-            'name'      => '身份码',
+            'name'      => '访问码',
             'type'      => 'varchar(80)',
         ],
     ],

src/place/set/table/info.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '身份表',
+    'name' => '品牌表',
     'partition' => 'Dever::call("manage/common.system", [false, false])',
     'struct' => [
         'uid' => [
@@ -46,7 +46,7 @@ return [
         ],
 
         'code' => [
-            'name'      => '身份码',
+            'name'      => '访问码',
             'type'      => 'varchar(80)',
         ],
 
@@ -65,12 +65,6 @@ return [
             ],
         ],
 
-        'pay_account' => [
-            'name'      => '支付账户',
-            'type'      => 'tinyint(1)',
-            'default'   => -1,
-        ],
-
         'money_id' => [
             'name'      => '支付货币',
             'type'      => 'int(11)',

src/place/source/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place_source');
-define('DEVER_APP_LANG', '身份资源');
+define('DEVER_APP_LANG', '品牌资源');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/source/lib/Cart.php

@@ -48,7 +48,7 @@ class Cart
 
         $info = Dever::db('info', 'goods')->find($info_id);
         if (!$info) {
-            Dever::error('商品不存在');
+            Dever::error('资源不存在');
         }
 
         $stock = Dever::load('stock', 'goods')->yue($data['info_id'], $data['sku_id']);
@@ -84,7 +84,7 @@ class Cart
         return $this->getList();
     }
 
-    # 删除商品
+    # 删除资源
     public function delete($info_id, $sku_id)
     {
         $data['uid'] = Place::$uid;
@@ -103,7 +103,7 @@ class Cart
 
     public function confirm()
     {
-        //$id = Dever::input('ids', 'is_string', '请选择商品');
+        //$id = Dever::input('ids', 'is_string', '请选择资源');
         $where['uid'] = Place::$uid;
         $where['status'] = 1;
         $data = Dever::db('cart', 'goods')->select($where);
@@ -163,7 +163,7 @@ class Cart
             $result['detail'] = $data;
             return $result;
         } else {
-            Dever::error('请选择商品');
+            Dever::error('请选择资源');
         }
     }
 }

src/place/source/lib/Info.php

@@ -145,10 +145,10 @@ class Info
     public function getCode($id, $encode = true)
     {
         if (isset(Dever::$data['muser'])) {
-            $salt = Dever::$data['muser']['select']['data_id'];//身份id
+            $salt = Dever::$data['muser']['select']['data_id'];//品牌id
             $xorkey = Dever::$data['muser']['id'];//当前登录的管理员id
         } else {
-            $salt = Place::$info['id'];//身份id
+            $salt = Place::$info['id'];//品牌id
             $xorkey = Place::$info['uid'];//当前登录的管理员id
         }
         

src/place/source/lib/Price.php

@@ -49,16 +49,16 @@ class Price
         # 获取促销描述
         $info['promotion_text'] = '';
         if ($info['promotion']) {
-            $info['promotion_text'] = '<table class="rich-table">';
-            $info['promotion_text'] .= '<tr><td>原价<td><td><td><td>'.$info['m_price_text'].'<td></tr>';
+            $info['promotion_text'] = '<table class="rich-table" style="border-collapse: collapse; text-align: center; width: 100%;">';
+            $info['promotion_text'] .= '<tr><td>原价</td><td></td><td>'.$info['m_price_text'].'</td></tr>';
             $promotion = [$info['promotion']];
             foreach ($promotion as $k => $v) {
                 $text = Dever::load('info', 'place_score')->getText($v['price'], $set['score']);
-                $type = '<td><td>';
+                $type = '<td></td>';
                 if ($v['type'] != 3) {
-                    $type = '<td>'.$v['value'].'<td>';
+                    $type = '<td>'.$v['value'].'</td>';
                 }
-                $info['promotion_text'] .= '<tr><td>'.$v['name'].'<td>'.$type.'<td>'.$text.'<td></tr>';
+                $info['promotion_text'] .= '<tr><td>'.$v['name'].'</td>'.$type.'<td>'.$text.'</td></tr>';
             }
             $info['promotion_text'] .= '</table>';
         }

src/place/source/manage/info.php

@@ -195,12 +195,12 @@ $config = [
             ],
 
             'have_vip' => [
-                'tip' => '角色专享资源，勾选的角色才能购买该资源',
+                'tip' => '身份专享资源，勾选的身份才能购买该资源',
                 'type' => 'tree',
             ],
             /*
             'place_source/info_role' => [
-                'name' => '角色设置',
+                'name' => '身份设置',
                 'where'  => ['info_id' => 'id'],
             ],
             */

src/place/source/manage/info_role.php

@@ -9,8 +9,8 @@ return [
             ],
 
             'level_id' => [
-                'placeholder' => '不选则为所有角色等级',
-                'tip' => '选择角色等级，可以多选<br />不选则为所有角色等级',
+                'placeholder' => '不选则为所有身份等级',
+                'tip' => '选择身份等级，可以多选<br />不选则为所有身份等级',
                 'type' => 'select',
                 'clearable' => true,
                 'multiple' => true,
@@ -20,7 +20,7 @@ return [
                 'tip' => '购买当前资源的折扣，直接填写数字即可，填写9就是9折
                     <br />资源当前价格*(购买折扣/10)=资源实付价格
                     <br />如：此处购买折扣填写为8，则资源实付价格=资源当前价格*(8/10)
-                    <br />不填写则使用角色里填写的购买折扣，填写0则免费',
+                    <br />不填写则使用身份里填写的购买折扣，填写0则免费',
                 'placeholder' => '资源当前价格*(购买折扣/10)=权益实付价格',
             ],
         ],

src/place/source/manage/sku.php

@@ -25,11 +25,13 @@ return [
 2.可以输入erp编码，库存编号，标准条码等;<br />
 3.对于多规格的资源，可以设置每个规格(SKU)的编码。',
             ],
+            /*
             'unum' => [
                 'type' => 'text',
                 'tip' => '1.用户购买后拥有的可使用次数;<br />
 2.对于设置了扣减次数的资源内容、功能，在查看内容或使用功能后，将扣减拥有的次数;<br />',
             ],
+            */
         ],
     ],
 ];

src/place/source/table/info.php

@@ -123,7 +123,7 @@ return [
         ],
 
         'have_vip' => [
-            'name'      => '角色专享',
+            'name'      => '身份专享',
             'type'      => 'varchar(800)',
             'value'    => 'Dever::call("place_role/manage/data.getList")',
         ],

src/place/source/table/info_role.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '资源角色设置表',
+    'name' => '资源身份设置表',
     'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'info_id' => [
@@ -9,13 +9,13 @@ return [
         ],
 
         'role_id' => [
-            'name'      => '角色',
+            'name'      => '身份',
             'type'      => 'int(11)',
             'value'     => 'place_role/info',
         ],
 
         'level_id' => [
-            'name'      => '角色等级',
+            'name'      => '身份等级',
             'type'      => 'varchar(500)',
         ],
 

src/place/stock/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place_stock');
-define('DEVER_APP_LANG', '身份库存');
+define('DEVER_APP_LANG', '品牌库存');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/user/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'place_user');
-define('DEVER_APP_LANG', '身份用户');
+define('DEVER_APP_LANG', '品牌用户');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../boot.php');

src/place/user/lib/Info.php

@@ -33,7 +33,7 @@ class Info
             }
         }
         Dever::load('log', 'place_score')->action('注册')->add($uid);
-        # 升级初始角色等级
+        # 升级初始身份等级
         Dever::load('info', 'place_role')->up($uid, $sales_type, $sales_id);
 
         return $uid;

src/place/user/lib/Role.php

@@ -3,7 +3,7 @@ use Dever;
 class Role
 {
     private static $level = [];
-    # 获取当前用户的角色等级列表
+    # 获取当前用户的身份等级列表
     public function getLevel($uid, $info_id = false)
     {
         $result = [];

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

@@ -25,6 +25,9 @@ class User
     public function getDesc($uid, $name, $mobile, $title)
     {
         $user = Dever::db('info', 'place_user')->find($uid);
+        if (!$user) {
+            return [];
+        }
         if (!$name) {
             $name = $user['name'];
         }

src/place/user/table/coupon_log.php

@@ -25,7 +25,7 @@ return [
             'type'      => 'tinyint(1)',
             'value'     => [
                 1 => '资源订单',
-                2 => '角色订单',
+                2 => '身份订单',
             ],
         ],
         'order_id' => [

src/place/user/table/gift_log.php

@@ -25,7 +25,7 @@ return [
             'type'      => 'tinyint(1)',
             'value'     => [
                 1 => '资源订单',
-                2 => '角色订单',
+                2 => '身份订单',
             ],
         ],
         'order_id' => [

src/place/user/table/info.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'name' => '身份用户表',
+    'name' => '品牌用户表',
     'partition' => 'Dever::call("manage/common.system")',
     'struct' => [
         'sales_type' => [
@@ -73,8 +73,8 @@ return [
             'type'      => 'tinyint(1)',
             'default'   => 2,
             'value'     => [
-                1 => '临时用户',
-                2 => '正式用户',
+                1 => '正式用户',
+                2 => '临时用户',
             ],
         ],
         'num_order' => [

src/sector/index.php

@@ -1,5 +1,5 @@
 <?php
 define('DEVER_APP_NAME', 'sector');
-define('DEVER_APP_LANG', '行业领域');
+define('DEVER_APP_LANG', '领域领域');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../../boot.php');