diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 6c0807fa0..1ad717e8e 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -28,7 +28,7 @@ return array( 'DOWNLOAD_UPLOAD' => array( 'mimes' => '', //允许上传的文件MiMe类型 'maxSize' => 0, //上传的文件大小限制 (0-不做限制) - 'exts' => 'jpg,gif,png,jpeg,zip,rar,tar,gz,7z,doc,docx,txt,xml,mp4', //允许上传的文件后缀 + 'exts' => 'jpg,gif,png,jpeg,zip,rar,tar,gz,7z,doc,docx,txt,xml,mp4,xlsx', //允许上传的文件后缀 'autoSub' => true, //自动子目录保存文件 'subName' => array('date', 'Y-m-d'), //子目录创建方式,[0]-函数名,[1]-参数,多个参数使用数组 'rootPath' => './Uploads/Download/', //保存根路径 diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index a7d71ba66..f253fe90b 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -414,6 +414,7 @@ function uploadFile() { if (uploaderFile === false) { + iconInfo = {userId:"kazaff", md5:"",icon:1}; //用户会话信息 uploaderFile = true; var uploader = WebUploader.create({ // 选完文件后,是否自动上传。 @@ -432,8 +433,8 @@ paste: document.body, accept: { title: '文件', - extensions: 'png,gif,jpg,jpeg,bmp,txt,doc*,xlsx,asp,pdf', - mimeTypes: '.png,.gif,.jpg,.jpeg,.bmp,.txt,.doc*,.xlsx,.asp,.pdf', + extensions: 'png,gif,jpg,jpeg,bmp,txt,doc*,xls*,asp', + mimeTypes: '.png,.gif,.jpg,.jpeg,.bmp,.txt,.doc*,.xls*,.asp', }, // 不压缩image, 默认如果是jpeg,文件上传前会压缩一把再上传! resize: false, @@ -443,6 +444,7 @@ thumb:true, compress:false, prepareNextFile: true, + formData: function(){return $.extend(true, {}, iconInfo);}, chunked:false, duplicate: true }); @@ -500,6 +502,7 @@ uploader.on( 'uploadSuccess', function( file, response ) { var text = '已上传'; + console.log(response); if (response.status == 1) { $('#transfer_proof').val(response.id); } else { diff --git a/Data/update.sql b/Data/update.sql index 9a9da04f4..b142019d2 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -941,3 +941,7 @@ ALTER TABLE tab_promote add `company_relation` tinyint(1) NOT NULL DEFAULT '0' C -- 提现结算类型 cxj ALTER TABLE `tab_withdraw` ADD COLUMN `settlement_type` tinyint(3) NOT NULL DEFAULT 3 COMMENT '结算类型:1-周结 2-月结 3-管理员提现 4-推广员提现 5-其他'; + +-- 2020 01-03 cxj +ALTER TABLE `sys_file` +MODIFY COLUMN `mime` char(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '文件mime类型';