优化上传组件，修复一处bug

app/controller/Upload.php

@@ -61,11 +61,11 @@ class Upload extends Base {
 			'query' => $this->request->param()
 		];
 		if($param['type'] == 'file'){
-			$map[] = ['ext', '<>', 'image'];
+			$map[] = ['type', '<>', 'image'];
 		}else{
-			$map[] = ['ext', '=', 'image'];
+			$map[] = ['type', '=', 'image'];
 		}
-		$list = Db::name('Attach')->paginate($pageConfig);
+		$list = Db::where($map)->name('Attach')->paginate($pageConfig);
 
 		$this->data = [
 			'from' => $this->request->param('from'),
@@ -141,6 +141,8 @@ class Upload extends Base {
 		$data = [];
 		$file= $request->file('file');
 		$data['savename']    = $request->param('name');
+		$data['name']        = $request->param('name');
+		$data['type']        = $upload_type;
 		$data['mime']        = $request->param('type');
 		$data['size']        = $file->getSize(); //文件大小，单位字节
 		$data['md5']         = md5_file($file->getPathname());

app/controller/admin/Wechat.php

@@ -135,7 +135,7 @@ class Wechat extends Base {
 			$data = $this->request->post();
 			$result = WechatPay::create($data);
 			if (false != $result) {
-				return $this->success('添加成功！', url('/admin/wechat/index'));
+				return $this->success('添加成功！', url('/admin/wechat/pay'));
 			} else {
 				return $this->error('添加失败！');
 			}
@@ -156,7 +156,7 @@ class Wechat extends Base {
 			$data = $this->request->post();
 			$result = WechatPay::update($data, ['id' => $data['id']]);
 			if ($result !== false) {
-				return $this->success('编辑成功！', url('/admin/wechat/index'));
+				return $this->success('编辑成功！', url('/admin/wechat/pay'));
 			} else {
 				return $this->error('修改失败！');
 			}

app/http/form/template/attach.html

@@ -13,7 +13,7 @@
 		<div class="item" data-id="{$file['id']}">
 			<div class="attach">
 				<div class="close"><i class="fa fa-close"></i></div>
-				<span>{$file['savename']}</span>
+				<span>{$file['name']}</span>
 			</div>
 		</div>
 		{/if}

app/http/form/template/image.html

@@ -8,12 +8,12 @@
 	<div id="fileList_{$name}" class="img-list">
 		{if $value}
 		{php}
-		$images = get_cover($value);
+		$images = get_attach($value);
 		{/php}
 		<div class="item" data-id="{$images['id']}">
 			<div class="thumb">
 				<div class="close"><i class="fa fa-close"></i></div>
-				<img src="{$images['path']}" alt="{$images['create_time']}">
+				<img src="{$images['url']}" alt="{$images['create_time']}">
 			</div>
 		</div>
 		{/if}

app/http/form/template/images.html

@@ -8,12 +8,12 @@
 	<div id="fileList_{$name}" class="img-list">
 		{if $value}
 		{php}
-		$images = get_cover($value);
+		$images = get_attach($value);
 		{/php}
 		<div class="item" data-id="{$images['id']}">
 			<div class="thumb">
 				<div class="close"><i class="fa fa-close"></i></div>
-				<img src="{$images['path']}" alt="{$images['create_time']}">
+				<img src="{$images['url']}" alt="{$images['create_time']}">
 			</div>
 		</div>
 		{/if}

public/static/common/css/form.css

@@ -4,4 +4,5 @@
 .img-list .item .thumb img{width: 100%;}
 .img-list .item .thumb .close{position: absolute; right: 5px; top: 5px; opacity: 1; width: 20px; height: 20px; font-size: 10px; text-align: center; line-height: 20px; color: #ffffff; border-radius: 50%; background: #333333;}
 .file-list{padding: 10px 0; display: flex; flex-direction: column;}
-.file-list .attach{line-height: 35px; border-bottom: 1px dotted #333333; cursor: pointer;}
+.file-list .attach{line-height: 35px; border-bottom: 1px dotted #333333; cursor: pointer; display: flex; justify-content: flex-start;}
+.file-list .attach .close{line-height: 35px; margin-right: 10px;}

public/static/common/js/require-form.js

@@ -595,7 +595,7 @@ define(['jquery', 'bootstrap', 'validator'], function ($, undefined, Validator)
 					if(param.type == 'image'){
 						var html = '<div class="item"><div class="thumb" data-id="'+fileList[0].id+'"><div class="close"><i class="fa fa-close"></i></div><img src="'+fileList[0].url+'" /></div></div>';
 					}else{
-						var html = '<div class="item"><div class="attach" data-id="'+fileList[0].id+'"><div class="close"><i class="fa fa-close"></i></div><span>'+fileList[0].savename+'</span></div></div>';
+						var html = '<div class="item"><div class="attach" data-id="'+fileList[0].id+'"><div class="close"><i class="fa fa-close"></i></div><span>'+fileList[0].name+'</span></div></div>';
 					}
 					
 					file.html(html);
@@ -606,7 +606,7 @@ define(['jquery', 'bootstrap', 'validator'], function ($, undefined, Validator)
 							if(param.type == 'image'){
 								var html = '<div class="item"><div class="thumb" data-id="'+fileList[i].id+'"><div class="close"><i class="fa fa-close"></i></div><img src="'+fileList[i].url+'" /></div></div>';
 							}else{
-								var html = '<div class="item"><div class="attach" data-id="'+fileList[i].id+'"><div class="close"><i class="fa fa-close"></i></div><span>'+fileList[i].savename+'</span></div></div>';
+								var html = '<div class="item"><div class="attach" data-id="'+fileList[i].id+'"><div class="close"><i class="fa fa-close"></i></div><span>'+fileList[i].name+'</span></div></div>';
 							}
 							value.push(fileList[i].id);
 							file.append(html);

view/upload/server.html

@@ -34,7 +34,7 @@
 			<div class="file-list">
 				{volist name="list" id="item"}
 				<div class="item">
-					<div class="attach" data-id="{$item['id']}" data-url="{$item['url']}" data-savename="{$item['savename']}">{$item['savename']}<div class="ok"></div></div>
+					<div class="attach" data-id="{$item['id']}" data-url="{$item['url']}" data-name="{$item['name']}">{$item['name']}<div class="ok"></div></div>
 				</div>
 				{/volist}
 			</div>