Commit 4a39f42f authored by zhoujun's avatar zhoujun

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

parents 9e101de7 8a56dac4
...@@ -156,7 +156,7 @@ textarea { ...@@ -156,7 +156,7 @@ textarea {
background-size: 100% auto; background-size: 100% auto;
} }
.postcard-container { .postcard-container {
min-height: 1800px; min-height: 2100px;
padding-bottom: 1rem; padding-bottom: 1rem;
background: url("../images/body_bg2.jpg") no-repeat center top, url("../images/bg.jpg") repeat-y center; background: url("../images/body_bg2.jpg") no-repeat center top, url("../images/bg.jpg") repeat-y center;
background-size: 100% auto; background-size: 100% auto;
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
.postcard-container { .postcard-container {
min-height: 1800px; min-height: 2100px;
padding-bottom: 1rem; padding-bottom: 1rem;
background: url("../images/body_bg2.jpg") no-repeat center top,url("../images/bg.jpg") repeat-y center; background: url("../images/body_bg2.jpg") no-repeat center top,url("../images/bg.jpg") repeat-y center;
background-size: 100% auto; background-size: 100% auto;
......
...@@ -150,6 +150,14 @@ ...@@ -150,6 +150,14 @@
<script> <script>
$(function () { $(function () {
function getQueryString(name) {
let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
let r = window.location.search.substr(1).match(reg);
if (r != null) {
return decodeURIComponent(r[2]);
}
return null;
}
function renderHtml(dom, num) { function renderHtml(dom, num) {
var str = num.toString(); var str = num.toString();
var arr = str.split(""); var arr = str.split("");
...@@ -159,7 +167,6 @@ ...@@ -159,7 +167,6 @@
}) })
$(dom).html(html); $(dom).html(html);
} }
@if($info->online_time > 0) @if($info->online_time > 0)
renderHtml('#bNum',{{ ceil($info->online_time / 86400 ) }}); renderHtml('#bNum',{{ ceil($info->online_time / 86400 ) }});
@else @else
...@@ -174,6 +181,7 @@ ...@@ -174,6 +181,7 @@
var formData = new FormData(); var formData = new FormData();
var file = $("#file")[0].files[0]; var file = $("#file")[0].files[0];
var acceptFileTypes = /^image\/(gif|jpe?g|png)$/i; var acceptFileTypes = /^image\/(gif|jpe?g|png)$/i;
var roleId = getQueryString('roleId');
//文件类型判断 //文件类型判断
if (file.type.length && !acceptFileTypes.test(file.type)) { if (file.type.length && !acceptFileTypes.test(file.type)) {
alert('请上传gif、jpg、jpeg或png格式的文件'); alert('请上传gif、jpg、jpeg或png格式的文件');
...@@ -185,6 +193,7 @@ ...@@ -185,6 +193,7 @@
return false; return false;
} }
formData.append("imgFile", file); formData.append("imgFile", file);
formData.append("roleId", roleId);
formData.append("_token", "{{ csrf_token() }}") formData.append("_token", "{{ csrf_token() }}")
$.ajax({ $.ajax({
url: "/upload/img", url: "/upload/img",
...@@ -227,11 +236,12 @@ ...@@ -227,11 +236,12 @@
$('.btn-save').click(function () { $('.btn-save').click(function () {
$('.loading').show(); $('.loading').show();
$('.btn-save,.btn-share').hide(); $('.btn-save,.btn-share,.login-info').hide();
$('html,body').animate({ $('html,body').animate({
scrollTop: 0 scrollTop: 0
}, 0); }, 0);
baseImageUrl(); baseImageUrl();
$('.postcard-container').addClass('fixed');
}); });
$('.dialog-img,.share-img').click(function () { $('.dialog-img,.share-img').click(function () {
$(this).fadeOut(); $(this).fadeOut();
......
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