edit

service/agent/database/member.php

@@ -63,7 +63,7 @@ return array
             'desc'      => '',
             'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'        => true,
+            //'list'        => true,
         ),
 
         'name'      => array
@@ -125,11 +125,11 @@ return array
 			'callback'	=> 'sha1',
 		),
 
-        'mid'      => array
+        'parent_mid'      => array
         (
             'type'      => 'int-11',
             'name'      => '邀请人',
-            'default'   => '',
+            'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
             'update'    => 'text',
@@ -139,7 +139,7 @@ return array
                 'col' => 'name',
                 'result' => 'id',
             ),
-            'list'      => 'Dever::load("agent/member-find#name", {mid})',
+            'list'      => 'Dever::load("agent/member-find#name", {parent_mid})',
         ),
 
         'code'        => array
@@ -150,16 +150,17 @@ return array
             'desc'      => '邀请码',
             'match'     => 'option',
             //'update'    => 'text',
-            'list'      => true,
+            'list'      => 'Dever::load("invite/api.code", {id})',
         ),
 
         'role'      => array
         (
-            'type'      => 'varchar-500',
+            'type'      => 'int-11',
             'name'      => '代理角色',
             'default'   => '',
             'desc'      => '代理角色',
-            'match'     => 'is_string',
+            'match'     => 'is_numeric',
+            'search'	=> 'select',
             'update'    => 'checkbox',
             'option'    => $role,
             'list'      => true,

service/agent/database/order.php

@@ -17,6 +17,14 @@ $status = array
     2 => '待财务终审',
     3 => '待权益发放',
     4 => '已完成',
+    5 => '已作废',
+);
+
+$pay_status = array
+(
+    1 => '待支付',
+    2 => '已支付',
+    3 => '已退款',
 );
 
 $goods_status = array
@@ -66,6 +74,7 @@ return array
     'set' => array
     (
     	'status' => $status,
+    	'pay_status' => $pay_status,
     	'goods_status' => $goods_status,
     	'type' => $type,
     	'pay_type' => $pay_type,
@@ -83,7 +92,7 @@ return array
             'desc'      => '',
             'match'     => 'is_numeric',
             'search'    => 'order',
-            'list'        => true,
+            //'list'        => true,
         ),
 
         'mid'      => array
@@ -131,7 +140,7 @@ return array
         (
             'type'      => 'int-11',
             'name'      => '邀请人',
-            'default'   => '',
+            'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
             'update'    => 'text',
@@ -179,7 +188,7 @@ return array
             'search'    => 'linkage',
             'update'    => 'linkage',
             'option'    => Dever::url('api.get?level_total=4', 'area'),
-            //'list'      => 'Dever::load("area/api.string", "{area}")',
+            'list'      => 'Dever::load("area/api.string", "{area}")',
         ),
 
         'price'      => array
@@ -316,6 +325,16 @@ return array
             'list'      => true,
         ),
 
+        'pay_status'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '支付状态',
+            'default'   => '1',
+            'desc'      => '状态',
+            'match'     => 'is_numeric',
+            'option'    => $pay_status,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -343,6 +362,15 @@ return array
         'insert' => false,
         'delete' => false,
         'edit' => false,
+
+        'list_button' => array
+        (
+            //fast_list
+            'list' => array('查看详情', '"sell_order_goods&project=shop&order_id={id}&page_type=1"'),
+
+            //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),
+            //'delete' => array('删除', '', '{status} == 1'),
+        ),
     ),
 
     'request' => array

service/agent/database/order_process.php

@@ -0,0 +1,88 @@
+<?php
+
+$status = array
+(
+    1 => '正常',
+);
+
+return array
+(
+    # 表名
+    'name' => 'order_process',
+    # 显示给用户看的名称
+    'lang' => '订单审核进度表',
+    'menu' => false,
+    'status' => $status,
+    # 数据结构
+    'struct' => array
+    (
+    
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            'update'    => 'hidden',
+            //'list'        => true,
+        ),
+
+        'order_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '订单表id',
+            'default'   => '',
+            'desc'      => '订单表id',
+            'match'     => 'is_numeric',
+        ),
+
+        'status'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '状态',
+            'match'     => 'is_numeric',
+            //'update'  => 'select',
+            'option'    => $status,
+            'search'    => 'select',
+            'list'      => true,
+            'edit'      => true,
+        ),
+
+        'state'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+        
+        'cdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '创建时间',
+            'match'     => array('is_numeric', time()),
+            'desc'      => '',
+            # 只有insert时才生效
+            //'insert'    => true,
+            'search'    => 'date',
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+        ),
+    ),
+
+    'manage' => array
+    (
+        'insert' => false,
+        'delete' => false,
+        'page_list' => 'order_process',
+    ),
+
+    'request' => array
+    (
+        
+    ),
+);

service/agent/index.php

@@ -1 +1,8 @@
-index.php
+<?php
+
+define('DEVER_APP_NAME', 'agent');
+define('DEVER_APP_LANG', '代理商');
+define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+define('DEVER_MANAGE_ORDER', 20);
+define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-tower layui-icon-website');
+include(DEVER_APP_PATH . '../boot.php');

service/agent/src/Core.php → service/agent/lib/Core.php

@@ -16,6 +16,7 @@ class Core
         if ($this->uid <= 0) {
             $this->uid = 1;
         }
+        $this->checkLogin();
         if ($this->uid) {
             $this->user = Dever::db('agent/member')->find($this->uid);
         }
@@ -31,13 +32,4 @@ class Core
             Dever::alert('请先登录', -2);
         }
     }
-
-    public function alert($state)
-    {
-        if ($state) {
-            return array('msg' => 'ok');
-        } else {
-            Dever::alert('操作失败');
-        }
-    }
 }

service/agent/lib/Member.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Agent\Lib;
+
+use Dever;
+
+class Member
+{
+    /**
+     * 检测邀请码
+     *
+     * @return mixed
+     */
+    public function checkCode()
+    {
+        $code = Dever::input('code');
+        if (!$code) {
+        	Dever::alert('请输入邀请码');
+        }
+        $uid = Dever::load('invite/api')->getUid($code);
+        if (!$uid) {
+        	Dever::alert('邀请码错误');
+        }
+
+        $user = Dever::db('agent/member')->find($where);
+        if (!$user) {
+        	Dever::alert('邀请码错误');
+        }
+
+        if ($user['status'] == 2) {
+        	return $user;
+        }
+
+        Dever::alert('邀请人状态不正常');
+    }
+
+	/**
+     * 验证手机号
+     * @return mixed
+     */
+    public function checkMobile($mobile)
+    {
+        $rule = Dever::rule('mobile');
+
+        if (!$mobile) {
+            Dever::alert('手机号不能为空');
+        }
+        if (!preg_match($rule, $mobile)) {
+            Dever::alert('手机号码格式错误');
+        }
+
+        return $mobile;
+    }
+
+    /**
+     * 验证验证码
+     * @return mixed
+     */
+    public function checkMcode($mobile)
+    {
+        $code = Dever::input('mcode');
+        if (!$code) {
+            Dever::alert('请输入验证码');
+        }
+        $code = Dever::load('passport/reg')->mcode($mobile, $code);
+        if (!$code) {
+            Dever::alert('验证码输入错误');
+        }
+    }
+}

service/agent/lib/Order.php

@@ -0,0 +1,285 @@
+<?php
+
+namespace Agent\Lib;
+
+use Dever;
+
+class Order
+{
+    /**
+     * 下单
+     *
+     * @return mixed
+     */
+    public function action($mid)
+    {
+    	if ($mid > 0) {
+    		$member = Dever::db('agent/member')->find($mid);
+    		if (!$member) {
+    			Dever::alert('代理商不存在');
+    		}
+    		$mobile = $member['mobile'];
+    		$parent_mid = $member['parent_mid'];
+    		$data['type'] = $data['type'];
+	        $data['name'] = $data['name'];
+	        $data['idcard'] = $data['idcard'];
+	        $data['idcard_front'] = $data['idcard_front'];
+	        $data['idcard_back'] = $data['idcard_back'];
+    	} else {
+    		$mobile = Dever::input('mobile');
+	        $where['mobile'] = Dever::load('agent/lib/member')->checkMobile($mobile);
+	        $member = Dever::db('agent/member')->find($where);
+
+	        if ($member) {
+	            Dever::alert('注册失败，手机号已存在');
+	        }
+
+	        $member = Dever::db('agent/member')->find();
+	        if ($member) {
+	        	$parent_member = Dever::load('agent/lib/member')->checkCode();
+	        	$parent_mid = $parent_member['id'];
+	        } else {
+	        	$parent_mid = -1;
+	        }
+
+	        $data['type'] = Dever::input('type', 1);
+	        $data['name'] = Dever::input('name');
+	        $data['idcard'] = Dever::input('idcard');
+	        $data['idcard_front'] = Dever::input('idcard_front');
+	        $data['idcard_back'] = Dever::input('idcard_back');
+    	}
+
+    	//Dever::load('agent/lib/member')->checkMcode($mobile);
+
+        $data['mobile'] = $mobile;
+        $data['parent_mid'] = $parent_mid;
+
+        if ($data['type'] == 1) {
+        	$name = '姓名';
+        	$idcard_name = '身份证号';
+
+        	if (!$data['idcard_front']) {
+	            Dever::alert('身份证正面不能为空');
+	        }
+	        if (!$data['idcard_back']) {
+	            Dever::alert('身份证反面不能为空');
+	        }
+
+        } else {
+        	$name = '公司名称';
+        	$idcard_name = '营业执照号码';
+
+        	if (!$data['idcard_front']) {
+	            Dever::alert('营业执照不能为空');
+	        }
+        }
+        if (!$data['name']) {
+            Dever::alert($name . '不能为空');
+        }
+        if (!$data['idcard']) {
+            Dever::alert($idcard_name . '不能为空');
+        }
+
+        $data += $this->getPrice();
+
+        $data['sign'] = Dever::input('sign');
+        if (!$data['sign']) {
+            Dever::alert('手写签名不能为空');
+        }
+
+        $data['order_num'] = $this->getOrderId();
+
+        # 付款信息
+        $data['pay_type'] = Dever::input('pay_type', 1);
+
+        if ($data['pay_type'] == 3) {
+        	$data['bank_id'] = Dever::input('bank_id');
+        	if (!$data['bank_id']) {
+        		Dever::alert('请选择银行');
+        	}
+        	$data['bank_card'] = Dever::input('bank_card');
+        	if (!$data['bank_card']) {
+        		Dever::alert('请输入银行卡号');
+        	}
+        } elseif ($data['pay_type'] == 2) {
+        	# 汇款
+        	$data['pay_pic'] = Dever::input('pay_pic');
+        	if (!$data['pay_pic']) {
+        		Dever::alert('请上传打款凭证');
+        	}
+        } elseif ($data['pay_type'] == 1) {
+        	Dever::alert('暂时不支持在线支付');
+        	$data['openid'] = Dever::input('openid');
+        	if (!$data['openid']) {
+        		Dever::alert('请先授权');
+        	}
+        } else {
+        	Dever::alert('付款方式不正确');
+        }
+
+        $where['mobile'] = $data['mobile'];
+        $where['role'] = $data['role'];
+        $where['area'] = $data['area'];
+
+        $info = Dever::db('agent/order')->find($where);
+        if ($info && $info['status'] != 5) {
+        	Dever::alert('请勿重复提交');
+        }
+
+        $data['id'] = Dever::db('agent/order')->insert($data);
+
+        if ($data['id']) {
+        	$result = array();
+        	$result['msg'] = '您的申请已经提交完成，请耐心等待，我们将在工作日8小时内为您通过审核，非常感谢。';
+        	if ($data['pay_type'] == 3) {
+        		$result['bank_msg'] = '您需要使用银行卡：所有人（'.$data['name'].'），账号（'.$data['bank_card'].'），转账至如下账户（'.$data['price_str'].'）:';
+        		$config = Dever::db('setting/base')->find();
+        		$result['bank_user'] = $config['bank_user'];
+        		$result['bank_name'] = $config['bank_name'];
+        		$result['bank_card'] = $config['bank_card'];
+        	} elseif ($data['pay_type'] == 1) {
+        		# 在线支付 生成支付信息
+        		$result['pay'] = $this->pay($data);
+        	}
+
+        	return $result;
+        } else {
+            Dever::alert('登录失败');
+        }
+    }
+
+    /**
+     * 发起在线支付
+     *
+     * @return mixed
+     */
+    public function pay($data)
+    {
+        $param = array
+        (
+            'project_id' => 2,
+            'channel_id' => 1,
+            'system_source' => 5,
+            'account_id' => 7,
+            'uid' => $data['id'],
+            'name' => $data['name'],
+            'openid' => $data['openid'],
+            'cash' => $data['price'],
+            'product_id' => $data['id'],
+            'order_id' => $data['order_num'],
+            'refer' => Dever::input('refer'),
+        );
+
+        $receipt = Dever::input('receipt');
+        if ($receipt) {
+            $param['receipt'] = $receipt;
+        }
+
+        $result = Dever::load('pay/api.pay', $param);
+        $result['order_num'] = $data['order_num'];
+        $result['order_id'] = $data['id'];
+
+        return $result;
+    }
+
+    /**
+     * 生成订单号
+     *
+     * @return mixed
+     */
+    public function getOrderId()
+    {
+        $where['order_num'] = Dever::order('D');
+        $state = Dever::db('agent/order')->one($where);
+        if (!$state) {
+            return $where['order_num'];
+        } else {
+            return $this->getOrderId();
+        }
+    }
+
+    # 支付成功回调 安全加密 设置token
+    public function success_secure_api_token()
+    {
+        $project_id = Dever::input('pay_project_id');
+        $info = Dever::db('pay/project')->one($project_id);
+        if ($info) {
+            return $info['key'];
+        }
+        return 'agent_buy_dever_2020';
+    }
+
+    # 支付成功回调 安全加密
+    public function success_secure_api($param = array())
+    {
+        $this->success($param);
+    }
+
+    # 支付成功回调
+    public function success($param = array())
+    {
+        $send = $param ? $param : Dever::preInput('pay_');
+        $product_id = $send['pay_product_id'];
+        $order_id = $send['pay_order_id'];
+        $status = $send['pay_status'];
+        $cash = $send['pay_cash'];
+        $msg = $send['pay_msg'];
+
+        $order = Dever::db('shop/buy_order')->one(array('id' => $product_id, 'time' => time()));
+        if ($order && $order['status'] == 1 && $status == 2) {
+            $update['status'] = 2;
+            $update['where_id'] = $order['id'];
+            Dever::db('shop/buy_order')->update($update);
+
+            # 生成结算单
+            Dever::load('cash/lib/order')->up($order, 1, 1);
+        }
+
+        return 'ok';
+    }
+
+    /**
+     * 获取支付金额
+     *
+     * @return mixed
+     */
+    public function getPrice()
+    {
+    	$data['role'] = Dever::input('role');
+        if (!$data['role']) {
+            Dever::alert('代理类型不能为空');
+        }
+        $role = Dever::db('setting/role')->find($data['role']);
+        if (!$role) {
+        	Dever::alert('代理类型不正确');
+        }
+        $data['area'] = Dever::input('area');
+        if (!$data['area']) {
+            Dever::alert('代理区域不能为空');
+        }
+
+        # 计算支付金额
+        if ($role['type'] == 1) {
+        	$data['price'] = $role['price'];
+        } elseif ($role['type'] == 2) {
+        	$data['price'] = Dever::load('area/api')->getPrice($role['area'], $data['area']);
+        	if ($data['price'] <= 0) {
+        		Dever::alert('代理区域的代理价格为空，请联系客服');
+        	}
+        } else {
+        	Dever::alert('代理类型不正确');
+        }
+
+        if ($data['price'] >= 10000) {
+            $data['price_str'] = ($data['price']/10000) . '万元';
+        } else {
+            $data['price_str'] = $data['price'] . '元';
+        }
+
+        if (is_int($data['price'])) {
+            $data['price_str'] .= '整';
+        }
+
+        return $data;
+    }
+}

service/agent/src/Auth.php

@@ -13,8 +13,9 @@ class Auth
      */
     public function login()
     {
-        $where['mobile'] = $this->checkMobile();
-        $this->checkMcode($where['mobile']);
+    	$mobile = Dever::input('mobile');
+        $where['mobile'] = Dever::load('agent/lib/member')->checkMobile($mobile);
+        Dever::load('agent/lib/member')->checkMcode($where['mobile']);
         $user = Dever::db('agent/member')->find($where);
 
         if (!$user) {
@@ -34,175 +35,72 @@ class Auth
      *
      * @return mixed
      */
-    public function reg()
+    public function reg_commit()
     {
-        $where['mobile'] = $this->checkMobile();
-        $user = Dever::db('agent/member')->find($where);
-
-        if ($user) {
-            Dever::alert('注册失败，手机号已存在');
-        }
-
-        $this->checkMcode($where['mobile']);
-
-        $user = $this->checkCode();
-
-        $data['mobile'] = $where['mobile'];
-        $data['parent_mid'] = $user['id'];
-        $data['type'] = Dever::input('type', 1);
-        $data['name'] = Dever::input('name');
-        $data['idcard'] = Dever::input('idcard');
-        $data['idcard_front'] = Dever::input('idcard_front');
-        $data['idcard_back'] = Dever::input('idcard_back');
-        if ($data['type'] == 1) {
-        	$name = '姓名';
-        	$idcard_name = '身份证号';
-
-        	if (!$data['idcard_front']) {
-	            Dever::alert('身份证正面不能为空');
-	        }
-	        if (!$data['idcard_back']) {
-	            Dever::alert('身份证反面不能为空');
-	        }
-
-        } else {
-        	$name = '公司名称';
-        	$idcard_name = '营业执照号码';
-
-        	if (!$data['idcard_front']) {
-	            Dever::alert('营业执照不能为空');
-	        }
-        }
-        if (!$data['name']) {
-            Dever::alert($name . '不能为空');
-        }
-        if (!$data['idcard']) {
-            Dever::alert($idcard_name . '不能为空');
-        }
-
-        $data['role'] = Dever::input('role');
-        if (!$data['role']) {
-            Dever::alert('代理类型不能为空');
-        }
-        $role = Dever::db('setting/role')->find($data['role']);
-        if (!$role) {
-        	Dever::alert('代理类型不正确');
-        }
-        $data['area'] = Dever::input('area');
-        if (!$data['area']) {
-            Dever::alert('代理区域不能为空');
-        }
-
-        # 计算支付金额
-        if ($role['type'] == 1) {
-        	$data['price'] = $role['price'];
-        } elseif ($role['type'] == 2) {
-        	$data['price'] = Dever::load('area/api')->getPrice($data['area'], $role['area']);
-        	if ($data['price'] <= 0) {
-        		Dever::alert('代理区域的代理价格为空，请联系客服');
-        	}
-        } else {
-        	Dever::alert('代理类型不正确');
-        }
-
-        $data['sign'] = Dever::input('sign');
-        if (!$data['sign']) {
-            Dever::alert('手写签名不能为空');
-        }
+        $state = Dever::load('agent/lib/order')->action(-1);
 
-        # 付款信息
-        $data['pay_type'] = Dever::input('pay_type', 1);
-
-        if ($data['pay_type'] == 3) {
-        	$data['bank_id'] = Dever::input('bank_id');
-        	if (!$data['bank_id']) {
-        		Dever::alert('请选择银行');
-        	}
-        	$data['bank_card'] = Dever::input('bank_card');
-        	if (!$data['bank_card']) {
-        		Dever::alert('请输入银行卡号');
-        	}
-        } elseif ($data['pay_type'] == 2) {
-        	# 汇款
-        	$data['pay_pic'] = Dever::input('pay_pic');
-        	if (!$data['pay_pic']) {
-        		Dever::alert('请上传打款凭证');
-        	}
-        } elseif ($data['pay_type'] == 1) {
-        	# 在线支付
+        if ($state) {
+        	return $state;
         } else {
-        	Dever::alert('付款方式不正确');
-        }
-
-        if ($user) {
-        	$data = Dever::load('passport/reg')->getSign($user['id']);
-            return $data;
-        } else {
-            Dever::alert('登录失败');
+            Dever::alert('注册失败');
         }
     }
 
     /**
-     * 检测邀请码
-     *
+     * 获取手机验证码
      * @return mixed
      */
-    public function checkCode()
+    public function getLoginMcode()
     {
-        $code = Dever::input('code');
-        if (!$code) {
-        	Dever::alert('请输入邀请码');
-        }
-        $uid = Dever::load('invite/api')->getUid($code);
-        if (!$uid) {
-        	Dever::alert('邀请码错误');
-        }
+        $mobile = Dever::load('agent/lib/member')->checkMobile(Dever::input('mobile'));
 
-        $user = Dever::db('agent/member')->find($where);
+        $user = Dever::db('agent/member')->find(array('mobile' => $mobile));
         if (!$user) {
-        	Dever::alert('邀请码错误');
+            Dever::alert('该手机号还未注册');
         }
 
-        if ($user['status'] == 2) {
-        	return $user;
-        }
+        $code = Dever::load('passport/reg')->mcode($mobile);
 
-        Dever::alert('邀请人状态不正常');
+        $msg = '验证码已发送至您的手机，请注意查收，十分钟之内有效';
+        $debug = Dever::config('base', 'project')->mobileCode['debug'];
+        if ($debug) {
+            $msg .= '::' . $code;
+        }
+        return $msg;
     }
 
 	/**
-     * 验证手机号
+     * 获取手机验证码
      * @return mixed
      */
-    private function checkMobile()
+    public function getRegMcode()
     {
-        $rule = Dever::rule('mobile');
+        $mobile = Dever::load('agent/lib/member')->checkMobile(Dever::input('mobile'));
 
-        $mobile = Dever::input('mobile');
-
-        if (!$mobile) {
-            Dever::alert('手机号不能为空');
-        }
-        if (!preg_match($rule, $mobile)) {
-            Dever::alert('手机号码格式错误');
+        $user = Dever::db('agent/member')->find(array('mobile' => $mobile));
+        if ($user) {
+            Dever::alert('该手机号已注册');
         }
 
-        return $mobile;
+        $code = Dever::load('passport/reg')->mcode($mobile);
+
+        $msg = '验证码已发送至您的手机，请注意查收，十分钟之内有效';
+        $debug = Dever::config('base', 'project')->mobileCode['debug'];
+        if ($debug) {
+            $msg .= '::' . $code;
+        }
+        return $msg;
     }
 
     /**
-     * 验证验证码
+     * 获取代理类型
      * @return mixed
      */
-    private function checkMcode($mobile)
+    public function getUpInfo()
     {
-        $code = Dever::input('mcode');
-        if (!$code) {
-            Dever::alert('请输入验证码');
-        }
-        $code = Dever::load('passport/reg')->mcode($mobile, $code);
-        if (!$code) {
-            Dever::alert('验证码输入错误');
-        }
+        $this->data['role'] = Dever::db('setting/role')->getInfo(array('opset' => 1));
+        $this->data['config'] = Dever::db('setting/base')->find();
+
+        return $this->data;
     }
 }

service/agent/src/My.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Agent\Src;
+
+use Dever;
+use Agent\Lib\Core;
+
+class My extends Core
+{
+	/**
+     * 获取基本信息
+     *
+     * @return mixed
+     */
+    public function getInfo()
+    {
+    	return $this->user;
+    }
+}

service/setting/database/base.php

@@ -34,6 +34,36 @@ return array
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 		),
+
+		'bank_user'		=> array
+		(
+			'type' 		=> 'varchar-300',
+			'name' 		=> '银行卡开户名称',
+			'default' 	=> '',
+			'desc' 		=> '银行卡开户名称',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+		),
+
+		'bank_name'		=> array
+		(
+			'type' 		=> 'varchar-300',
+			'name' 		=> '银行卡支行名称',
+			'default' 	=> '',
+			'desc' 		=> '银行卡支行名称',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+		),
+
+		'bank_card'		=> array
+		(
+			'type' 		=> 'varchar-300',
+			'name' 		=> '银行卡卡号',
+			'default' 	=> '',
+			'desc' 		=> '银行卡卡号',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+		),
 		
         'state'     => array
         (

service/setting/database/role.php

@@ -161,16 +161,16 @@ return array
 
     'default' => array
 	(
-		'col' => 'id,name,short_name,`desc`,type,area,opset,state,cdate',
+		'col' => 'id,name,short_name,`desc`,type,area,opset,profit,state,cdate',
 		'value' => array
 		(
-			'1,"普通用户", "用户", "注册但未注册成功代理商角色的用户", 1, -1, 2, 1,' . DEVER_TIME,
-			'2,"街道代理商", "街道", "一个街道区域的代理商。获得区域内门店利润5%收益。", 2, 1, 1, 1,' . DEVER_TIME,
-			'3,"区县代理商", "区县", "一线城市的区，与二三线城市的县级代理商。获得区域内门店利润3%收益。", 2, 2, 1, 1,' . DEVER_TIME,
-			'4,"城市代理商", "城市", "一个城市代理商，有一二三线城市的区分。获得区域内门店利润1%收益。", 2, 3, 1, 1,' . DEVER_TIME,
-			'5,"创服代理商", "创服", "在开创本系统时的一个代理商角色，以后此角色不新增，要保留，因为其中还有一些权益未兑换。", 3, -1, 2, 1,' . DEVER_TIME,
-			'6,"创客会员", "创客", "有分销能力的会员，但不产生代理商收益。", 1, -1, 1, 1,' . DEVER_TIME,
-			'7,"消客会员", "消客", "能带动产品销售量的会员。", 1, -1, 1, 1,' . DEVER_TIME,
+			'1,"普通用户", "用户", "注册但未注册成功代理商角色的用户", 1, 1, 2, "0", 1,' . DEVER_TIME,
+			'2,"街道代理商", "街道", "一个街道区域的代理商。获得区域内门店利润5%收益。", 2, 3, 1, "5", 1,' . DEVER_TIME,
+			'3,"区县代理商", "区县", "一线城市的区，与二三线城市的县级代理商。获得区域内门店利润3%收益。", 2, 2, 1, "3", 1,' . DEVER_TIME,
+			'4,"城市代理商", "城市", "一个城市代理商，有一二三线城市的区分。获得区域内门店利润1%收益。", 2, 1, 1, "1", 1,' . DEVER_TIME,
+			'5,"创服代理商", "创服", "在开创本系统时的一个代理商角色，以后此角色不新增，要保留，因为其中还有一些权益未兑换。", 3, 1, 2, "0", 1,' . DEVER_TIME,
+			'6,"创客会员", "创客", "有分销能力的会员，但不产生代理商收益。", 1, 1, 1, "0", 1,' . DEVER_TIME,
+			'7,"消客会员", "消客", "能带动产品销售量的会员。", 1, 1, 1, "0", 1,' . DEVER_TIME,
 		),
 	),
 
@@ -191,16 +191,17 @@ return array
 
     'request' => array
     (
-        'getAll' => array
+        'getInfo' => array
         (
             # 匹配的正则或函数 选填项
             'option' => array
             (
                 'type' => array('yes', 'in'),
-                //'state' => 1,
+                'opset' => 'yes',
+                'state' => 1,
             ),
             'type' => 'all',
-            'col' => '*|id',
+            'col' => 'id,short_name as name,area',
         ),
     ),
 );