edit

app/shop/database/info.php

@@ -73,7 +73,7 @@ $method = array
 
 $stat_type = Dever::db('cash/shop')->config['config_type'];
 $add = array();
-$add = array('自主签约','"sign&search_option_shop_id={id}&shop_id={id}&oper_table=info&where_id={id}"', '"{mid}" == ""');
+$add = array('自主签约','"sign&search_option_shop_id={id}&oper_table=info&where_id={id}"', '"{mid}" == ""');
 
 return array
 (

app/shop/database/sign.php

@@ -10,7 +10,7 @@ $mer_type = array
     1 => '企业商户',
     //3 => '小微商户',
 );
-$id = Dever::input('shop_id');
+$id = Dever::input('search_option_shop_id');
 $shop = array();
 $desc = '';
 if ($id && $id > 0) {
@@ -461,7 +461,11 @@ return array
     ),
 	'manage' => array
     (
+        # 图片上传后调用的接口
+        'upload' => 'shop/lib/sign.upload?shop_id=' . $id,
+        # 更新页面顶部描述
         'desc' => $desc,
+        # 更新页面tab切换
         'tab' => array('门店信息', '法人信息', '企业信息', '银行信息'),
         'list' => 'update',
     ),

app/shop/database/sign_log.php

@@ -125,6 +125,16 @@ return array
             'update'    => 'text',
         ),
 
+        'admin_id'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '管理员id',
+            'default'   => '0',
+            'desc'      => '管理员id',
+            'match'     => 'is_numeric',
+            'update'    => 'hidden',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

app/shop/database/sign_pic.php

@@ -59,6 +59,18 @@ return array
             'list'      => true,
         ),
 
+        'url'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '图片url',
+            'default'   => '',
+            'desc'      => '图片url',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            'list'      => true,
+        ),
+
         'document_name'      => array
         (
             'type'      => 'varchar-32',

app/shop/lib/Sign.php

@@ -12,22 +12,22 @@ Class Sign {
 	private $product_id = array('0');
 	private $document_type = array
 	(
-		['document_type' => '0001','document_name' => '身份证正面', 'key' => 'idcard_front'],
-		['document_type' => '0011','document_name' => '身份证反面', 'key' => 'idcard_back'],
-		['document_type' => '0002','document_name' => '营业执照', 'key' => 'license'],
-		['document_type' => '0003','document_name' => '税务登记证', 'key' => 'tax'],
-		['document_type' => '0005','document_name' => '门头照', 'key' => 'door'],
-		['document_type' => '0007','document_name' => '手持身份证自拍照', 'key' => 'hand_idcard'],
-		['document_type' => '0006','document_name' => '开户许可证', 'key' => 'open'],
-		['document_type' => '0025','document_name' => '银行卡正面照', 'key' => 'bank_fount'],
-		['document_type' => '0026','document_name' => '银行卡反面照', 'key' => 'bank_back'],
-		['document_type' => '0015','document_name' => '室内照片', 'key' => 'house_pic'],
+		'idcard_front' => ['document_type' => '0001','document_name' => '身份证正面'],
+		'idcard_back' => ['document_type' => '0011','document_name' => '身份证反面'],
+		'license' => ['document_type' => '0002','document_name' => '营业执照'],
+		'tax' => ['document_type' => '0003','document_name' => '税务登记证'],
+		'door' => ['document_type' => '0005','document_name' => '门头照'],
+		'hand_idcard' => ['document_type' => '0007','document_name' => '手持身份证自拍照'],
+		'open' => ['document_type' => '0006','document_name' => '开户许可证'],
+		'bank_fount' => ['document_type' => '0025','document_name' => '银行卡正面照'],
+		'bank_back' => ['document_type' => '0026','document_name' => '银行卡反面照'],
+		'house_pic' => ['document_type' => '0015','document_name' => '室内照片'],
 	);
 
 	# 获取日志
 	public function getLog($shop)
 	{
-		Dever::setInput('shop_id', -1);
+		Dever::setInput('search_option_shop_id', -1);
 		$sign = Dever::db('shop/sign')->find(array('shop_id' => $shop['id']));
 		if (!$sign) {
 			return Dever::timeline('填写资料');
@@ -42,7 +42,14 @@ Class Sign {
 					$v['desc'] .= '  <a href="'.$v['response']['url'].'" target="_blank">点此打开</a>  <a style="cursor:pointer" data-clipboard-text="'.$v['response']['url'].'" class="clipboard">复制链接</a>';
 				}
 				$date = date('Y-m-d H:i', $v['cdate']);
-				$result[] = $date . '&nbsp;&nbsp;' . $v['desc'];
+				$name = '';
+				if ($v['admin_id'] > 0) {
+					$admin = Dever::db('manage/admin')->find($v['admin_id']);
+					if ($admin) {
+						$name = '[' . $admin['username'] . ']&nbsp;&nbsp;';
+					}
+				}
+				$result[] = $date . '&nbsp;&nbsp;' . $name . ''. $v['desc'];
 			}
 		}
 
@@ -52,6 +59,7 @@ Class Sign {
 		}
 
 		$result = Dever::timeline('签约记录', $result);
+		Dever::setInput('search_option_shop_id', $shop['id']);
 		return $result;
 	}
 
@@ -95,6 +103,33 @@ Class Sign {
 		return 'ok';
 	}
 
+	# 上传图片
+	public function upload_api()
+	{
+		$document_type = $this->document_type;
+		$shop_id = Dever::input('shop_id');
+		$key = Dever::input('key');
+		$upload = Dever::json_decode(Dever::input('upload'));
+		if ($upload && isset($document_type[$key]) && isset($upload['url'])) {
+			$url = md5($upload['url']);
+			$sign_pic = Dever::db('shop/sign_pic')->find(array('shop_id' => $shop_id, 'key' => $key, 'url' => $url));
+			if (!$sign_pic) {
+				$pic = $this->pic($upload['url']);
+				if ($pic && isset($pic['data']['file_path']) && $pic['data']['file_path']) {
+					$insert = array();
+					$insert['shop_id'] = $shop_id;
+					$insert['url'] = $url;
+					$insert['document_type'] = $document_type[$key]['document_type'];
+					$insert['document_name'] = $document_type[$key]['document_name'];
+					$insert['key'] = $key;
+					$insert['path'] = Dever::json_encode($pic['data']);
+					Dever::db('shop/sign_pic')->insert($insert);
+				}
+			}
+		}
+		return 'ok';
+	}
+
 	#3.2  详细采集档案资料上传接口
 	private function up($shop, $sign)
 	{
@@ -154,16 +189,19 @@ Class Sign {
 		$document_type = $this->document_type;
 
 		foreach ($document_type as $k => $v) {
-			if (isset($sign[$v['key']]) && $sign[$v['key']]) {
-				$sign_pic = Dever::db('shop/sign_pic')->find(array('shop_id' => $shop['id'], 'key' => $v['key']));
+			if (isset($sign[$k]) && $sign[$k]) {
+				$sign[$k] = Dever::pic($sign[$k]);
+				$url = md5($sign[$k]);
+				$sign_pic = Dever::db('shop/sign_pic')->find(array('sign_id' => $sign['id'], 'key' => $k, 'url' => $url));
 				if (!$sign_pic) {
-					$pic = $this->pic($sign[$v['key']]);
+					$pic = $this->pic($sign[$k]);
 					if ($pic && isset($pic['data']['file_path']) && $pic['data']['file_path']) {
 						$insert = array();
 						$insert['shop_id'] = $shop['id'];
+						$insert['url'] = $url;
 						$insert['document_type'] = $v['document_type'];
 						$insert['document_name'] = $v['document_name'];
-						$insert['key'] = $v['key'];
+						$insert['key'] = $k;
 						$insert['path'] = Dever::json_encode($pic['data']);
 						Dever::db('shop/sign_pic')->insert($insert);
 						$data['pic_list'][] = array('document_name' => $v['document_name'], 'document_type' => $v['document_type'] , 'file_path'=> $pic['data']['file_path'], 'file_size'=>$pic['data']['file_size']);
@@ -419,6 +457,10 @@ Class Sign {
 		$data['shop_id'] = $sign['shop_id'];
 		$data['sign_id'] = $sign['id'];
 		$data['desc'] = $msg;
+		$admin = Dever::load('manage/auth.info');
+		if ($admin) {
+			$data['admin_id'] = $admin['id'];
+		}
 		if ($request_seq) {
 			$data['request_seq'] = $request_seq;
 		}