Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/database/member.php

@@ -127,7 +127,7 @@ return array
             'desc'      => '姓名',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => ($parent_mid || $pmid) ? 'hidden' : 'fulltext',
+            'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
             'list'      => 'Dever::load("agent/lib/member.getOne", {id})',
         ),
 
@@ -141,7 +141,7 @@ return array
             'update'    => 'date',
             'callback'  => 'maketime',
             // 'list'        => '{rdate} > 0 ? date("Y-m-d H:i", {rdate}) : "无"',
-            'list'      => 'Dever::load("agent/lib/member.set_rdate", {id})',
+            'list'      => ($pmid) ? false:'Dever::load("agent/lib/member.set_rdate", {id})',
         ),
 
         'avatar'		=> array
@@ -164,7 +164,7 @@ return array
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             'update'    => 'text',
-            'search'    => ($parent_mid || $pmid) ? 'hidden' : 'fulltext',
+            'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
             //'list'      => true,
         ),
 
@@ -239,7 +239,7 @@ return array
             'search'    => 'select',
             //'update'    => 'checkbox',
             'option'    => $source_id,
-            'list'      => true,
+            'list'      => ($pmid) ? false : true,
         ),
 
         'pmid'      => array
@@ -274,7 +274,7 @@ return array
             'search'	=> 'select',
             //'update'    => 'select',
             'option'    => $role,
-            //'list'      => true,
+            'list'      => ($pmid) ? true : false,
         ),
 
         'level_id'		=> array
@@ -300,7 +300,7 @@ return array
             'search'    => 'linkage',
             //'update'    => 'linkage',
             'option'    => Dever::url('api.get?level_total=4', 'area'),
-            'list'      => 'Dever::load("area/api.string", "{area}")',
+            'list'      =>($pmid) ? false: 'Dever::load("area/api.string", "{area}")',
         ),
 
         'shop_id'      => array
@@ -427,7 +427,7 @@ return array
             'desc'      => '余额',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => true,
+            'list'      => ($pmid) ? false : true,
         ),
 
         'sell'      => array
@@ -494,7 +494,7 @@ return array
             # 只有insert时才生效
             'insert'    => true,
             //'search'    => 'date',
-            //'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            'list'      => ($pmid) ? 'date("Y-m-d H:i:s", {cdate})': false,
         ),
     ),
 

service/agent/src/My.php

@@ -612,13 +612,20 @@ class My extends Core
     public function tixianInfo()
     {
         $this->data['user'] = $this->user;
+        print_R($this->data);die;
         $this->data['config'] = Dever::db('setting/base')->one();
         $this->data['config']['tax'] = $this->data['config']['tax']/100;
         $this->data['bank'] = Dever::db('setting/bank')->select();
 
         # 获取上次提现记录
         $this->data['mybank'] = Dever::db('bill/tixian')->getNew(array('mid' => $this->uid));
-
+        if($this->data['user']){#234初中高可提现
+            if($this->data['user']['level_id']==2 || $this->data['user']['level_id']==3 || $this->data['user']['level_id']==4){
+                $this->data['user']['ti_type']=1;
+            }else{
+                $this->data['user']['ti_type']=2;
+            }
+        }
         return $this->data;
     }
 
@@ -652,13 +659,17 @@ class My extends Core
         if ($card != $ycard) {
             Dever::alert('银行卡号和确认银行卡号不同');
         }
+        $sign = Dever::input('sign');
+        if(!$sign){
+            Dever::alert('手写签名不能为空');
+        }
 
         $config = Dever::db('setting/base')->one();
         $tax = $config['tax']/100;
         $ycash = $cash;
         $cash = $cash - $cash*$tax;
 
-        $id = Dever::load('bill/lib/tixian')->up($this->uid, $ycash, $cash, $name, $bank, $bankname, $card);
+        $id = Dever::load('bill/lib/tixian')->up($this->uid, $ycash, $cash, $name, $bank, $bankname, $card,$sign);
 
         if ($id) {
             $cash_id = Dever::load('bill/lib/cash')->up($this->uid, 11, $ycash, $this->user['role'], $id, '提现到'.substr($card, -4).'银行卡', 1);

service/bill/database/tixian.php

@@ -258,7 +258,17 @@ return array
 			'key' 		=> '1',
 			'place'		=> '150',
 		),
-
+        'sign'     => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '手写签名',
+            'default'   => '',
+            'desc'      => '手写签名',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '7',
+            'list'      => '"<img src=\'{sign}\' width=\'150\'>"',
+        ),
         'operdate'     => array
         (
             'type'      => 'int-11',

service/bill/lib/Tixian.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Tixian
 {
-    public function up($mid, $ycash, $cash, $name, $bank, $bankname, $card)
+    public function up($mid, $ycash, $cash, $name, $bank, $bankname, $card,$sign)
     {
         $member = Dever::db('agent/member')->find(array('id' => $mid, 'clear' => true));
         if ($member['status'] <= 2) {
@@ -21,6 +21,7 @@ class Tixian
     		$data['bank'] = $bank;
     		$data['bankname'] = $bankname;
     		$data['card'] = $card;
+            $data['sign'] = $sign;
             $data['status'] = 1;
     		return Dever::db('bill/tixian')->insert($data);
         }

service/setting/database/base.php

@@ -117,6 +117,16 @@ return array
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 		),
+		'market_desc'      => array
+        (
+            'type'      => 'text-255',
+            'name'      => '市场培训管理费',
+            'default'   => '',
+            'desc'      => '市场培训管理费',
+            'match'     => 'option',
+            'update'    => 'editor',
+            'key'       => '1',
+        ),
 		
         'state'     => array
         (