Commit 4b7045d4 authored by zhoujun's avatar zhoujun

Merge branch 'test' of http://gitlab.cccwangluo.com/zhoujun/uc_card into test

parents 73d854e9 118fc91b
This diff is collapsed.
...@@ -443,7 +443,8 @@ ...@@ -443,7 +443,8 @@
span { span {
padding-top: .2rem; padding-top: .2rem;
.fs(.32rem, #feee64); .fs(.24rem, @baseColor);
font-weight: bold;
display: inline-block; display: inline-block;
} }
.img-container{ .img-container{
......
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
<div class="ggsk-container"> <div class="ggsk-container">
<div class="img-container"> <div class="img-container">
@if($userImgStatus == -1) <img src="{{ asset('postcard/images/img_add.jpg') }}" class="img img-add" alt=""> @if($userImgStatus == -1) <img src="{{ asset('postcard/images/img_add.jpg') }}" class="img img-add" alt="">
<input type="file" id="file"> @endif <input type="file" id="file" accept="image/jpg, image/jpeg, image/png"> @endif
@if($userImgStatus == 0) <img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt=""> @endif @if($userImgStatus == 0) <img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt=""> @endif
@if($userImgStatus == 1) <img src="{{ $userImg }}" class="img img-sh" alt=""> @endif @if($userImgStatus == 1) <img src="{{ $userImg }}" class="img img-sh" alt=""> @endif
@if($userImgStatus == 2) <img src="{{ asset('postcard/images/sh_fail.jpg') }}" class="img img-sh" alt=""> @if($userImgStatus == 2) <img src="{{ asset('postcard/images/sh_fail.jpg') }}" class="img img-sh" alt="">
<input type="file" id="file"> @endif <input type="file" id="file" accept="image/jpg, image/jpeg, image/png"> @endif
</div> </div>
@if($userImgStatus != 1) @if($userImgStatus != 1)
<span>建议尺寸(710*414px)</span> <span>建议尺寸(710*414px)jpg,jpeg,png</span>
@endif @endif
</div> </div>
...@@ -206,19 +206,22 @@ ...@@ -206,19 +206,22 @@
$(document).on('change', '#file', function (e) { $(document).on('change', '#file', function (e) {
var formData = new FormData(); var formData = new FormData();
var file = $("#file")[0].files[0]; var file = $("#file")[0].files[0];
console.log(file)
var acceptFileTypes = /^image\/(gif|jpe?g|png)$/i; var acceptFileTypes = /^image\/(gif|jpe?g|png)$/i;
var roleId = getQueryString('roleId'); var roleId = getQueryString('roleId');
var serverId = getQueryString('serverId'); var serverId = getQueryString('serverId');
//文件类型判断 try{
if (file.type.length && !acceptFileTypes.test(file.type)) { // //文件类型判断
alert('请上传gif、jpg、jpeg或png格式的文件'); if (file && file.type && !acceptFileTypes.test(file.type)) {
return false; alert('请上传jpg、jpeg或png格式的文件');
} return false;
//文件大小判断 }
if (file.size > (2 * 1024 * 1024)) { //文件大小判断
alert('请上传不超过2M的文件'); if (file && file.size > (2 * 1024 * 1024)) {
return false; alert('请上传不超过2M的文件');
return false;
}
}catch (e) {
console.log(e)
} }
formData.append("imgFile", file); formData.append("imgFile", file);
formData.append("roleId", roleId); formData.append("roleId", roleId);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment