Commit 6a8344c5 authored by zhoujun's avatar zhoujun

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

parents 9fe2d539 a963d196
This diff is collapsed.
...@@ -439,14 +439,20 @@ ...@@ -439,14 +439,20 @@
background: url("../images/content8.png") no-repeat center top; background: url("../images/content8.png") no-repeat center top;
background-size: 100% auto; background-size: 100% auto;
text-align: center; text-align: center;
text-align: center; overflow: hidden;
span { span {
.fs(.58rem, #feee64); padding-top: .2rem;
.fs(.32rem, #feee64);
display: inline-block; display: inline-block;
width: 2.8rem;
} }
.img-container{
.pr();
width: 7.4rem;
height: 4.1rem;
overflow: hidden;
margin: 2.05rem auto 0;
}
#file { #file {
.pa(); .pa();
left: 1.5rem; left: 1.5rem;
...@@ -460,9 +466,11 @@ ...@@ -460,9 +466,11 @@
} }
img { img {
width: 7.4rem; .pa();
height: 4.1rem; left: 50%;
margin: 2rem 0 0 0; top: 50%;
transform: translate(-50%,-50%);
max-width: 7.5rem;
} }
} }
......
...@@ -100,7 +100,7 @@ card.bindRole = function (params){ ...@@ -100,7 +100,7 @@ card.bindRole = function (params){
$('.dialog').hide(); $('.dialog').hide();
location.href='/card/html?roleId='+params.roleId+'&serverId='+params.serverId; location.href='/card/html?roleId='+params.roleId+'&serverId='+params.serverId;
}else{ }else{
alert(res.msg) alert(res.message)
} }
}) })
} }
......
var card={relationRole:{},clickFlag:!0,bindInfo:{},bindFlag:!0};card.ajax=function(e,a){e.data._token=$('meta[name="token"]').attr("value"),$.ajax({type:e.type?e.type:"GET",url:location.origin+e.url,dataType:"json",data:e.data,error:function(e){try{var a=e.responseText;alert(a.message)}catch(e){alert("系统开小差~~")}},success:function(e){return 1019==e.error?(location.href="/login",!1):4003==e.error?(location.href="/bind/ald/code",!1):void a(e)}}),setTimeout(function(){card.clickFlag=!0},1e3)},card.handleGetServer=function(e){$(".loading").show(),this.ajax({url:"/ald_bind_info",type:"get",data:{}},function(e){card.bindInfo=e.data;var a={serverId:e.data.serverId,userId:e.data.userId};card.handleGetRoleList(a)})},card.handleGetRoleList=function(e){this.ajax({url:"/get_role_list",type:"POST",data:e},function(e){if(80001==e.error)return alert(e.message),!1;var a=e.data,r="",t=[];card.relationRole=a;for(var n in a)t.push({id:n,name:a[n].name});r='<option value="-1">请选择</option>',$(t).each(function(e,a){var t="";t=a.name.indexOf("非硬核-")>-1?a.name.replace("非硬核-",""):a.name.indexOf("硬核-")>-1?a.name.replace("硬核-",""):a.name.indexOf("越狱-")>-1?a.name.replace("越狱-",""):a.name,r+='<option value="'+a.id+'">'+t+"</option>"}),$(".server-select").html(r),$(".loading").hide(),$(".dialog-server").fadeIn()})},card.bindRole=function(e){card.bindFlag=!1,this.ajax({url:"/bind/ald/role",type:"POST",data:e},function(a){0===a.error?($(".dialog").hide(),location.href="/card/html?roleId="+e.roleId+"&serverId="+e.serverId):alert(a.msg)})};var initRoleList=function(e){var a=card.relationRole[e].list,r='<option value="-1">请选择</option>';$(a).each(function(e,a){r+='<option value="'+a.roleId+'">'+a.roleName+"</option>"}),$(".role-select").html(r)};$(function(){$(".btn-card-bind-role").click(function(){var e=$(".server-select option:selected").val(),a=$(".server-select option:selected").text(),r=$(".role-select option:selected").val();if(roleName=$(".role-select option:selected").text(),!e||"-1"==e)return alert("请选择服务器"),!1;if(!r||"-1"==r)return alert("请选择角色"),!1;var t={roleId:r,serverId:e,serverName:a,roleName:roleName};card.bindFlag&&(setTimeout(function(){card.bindFlag=!0},3e3),card.bindRole(t))}),$(".server-select").change(function(){var e=$(this).val();if(-1==e)return $(".role-select").html(""),!1;initRoleList(e)})}); var card={relationRole:{},clickFlag:!0,bindInfo:{},bindFlag:!0};card.ajax=function(e,a){e.data._token=$('meta[name="token"]').attr("value"),$.ajax({type:e.type?e.type:"GET",url:location.origin+e.url,dataType:"json",data:e.data,error:function(e){try{var a=e.responseText;alert(a.message)}catch(e){alert("系统开小差~~")}},success:function(e){return 1019==e.error?(location.href="/login",!1):4003==e.error?(location.href="/bind/ald/code",!1):void a(e)}}),setTimeout(function(){card.clickFlag=!0},1e3)},card.handleGetServer=function(e){$(".loading").show(),this.ajax({url:"/ald_bind_info",type:"get",data:{}},function(e){card.bindInfo=e.data;var a={serverId:e.data.serverId,userId:e.data.userId};card.handleGetRoleList(a)})},card.handleGetRoleList=function(e){this.ajax({url:"/get_role_list",type:"POST",data:e},function(e){if(80001==e.error)return alert(e.message),!1;var a=e.data,r="",t=[];card.relationRole=a;for(var n in a)t.push({id:n,name:a[n].name});r='<option value="-1">请选择</option>',$(t).each(function(e,a){var t="";t=a.name.indexOf("非硬核-")>-1?a.name.replace("非硬核-",""):a.name.indexOf("硬核-")>-1?a.name.replace("硬核-",""):a.name.indexOf("越狱-")>-1?a.name.replace("越狱-",""):a.name,r+='<option value="'+a.id+'">'+t+"</option>"}),$(".server-select").html(r),$(".loading").hide(),$(".dialog-server").fadeIn()})},card.bindRole=function(e){card.bindFlag=!1,this.ajax({url:"/bind/ald/role",type:"POST",data:e},function(a){0===a.error?($(".dialog").hide(),location.href="/card/html?roleId="+e.roleId+"&serverId="+e.serverId):alert(a.message)})};var initRoleList=function(e){var a=card.relationRole[e].list,r='<option value="-1">请选择</option>';$(a).each(function(e,a){r+='<option value="'+a.roleId+'">'+a.roleName+"</option>"}),$(".role-select").html(r)};$(function(){$(".btn-card-bind-role").click(function(){var e=$(".server-select option:selected").val(),a=$(".server-select option:selected").text(),r=$(".role-select option:selected").val();if(roleName=$(".role-select option:selected").text(),!e||"-1"==e)return alert("请选择服务器"),!1;if(!r||"-1"==r)return alert("请选择角色"),!1;var t={roleId:r,serverId:e,serverName:a,roleName:roleName};card.bindFlag&&(setTimeout(function(){card.bindFlag=!0},3e3),card.bindRole(t))}),$(".server-select").change(function(){var e=$(this).val();if(-1==e)return $(".role-select").html(""),!1;initRoleList(e)})});
\ No newline at end of file \ No newline at end of file
...@@ -129,12 +129,18 @@ ...@@ -129,12 +129,18 @@
<!--高光时刻--> <!--高光时刻-->
<div class="ggsk-container"> <div class="ggsk-container">
@if($userImgStatus == -1) <img src="{{ asset('postcard/images/img_add.jpg') }}" class="img img-add" alt=""> <div class="img-container">
<input type="file" id="file"> @endif @if($userImgStatus == -1) <img src="{{ asset('postcard/images/img_add.jpg') }}" class="img img-add" alt="">
@if($userImgStatus == 0) <img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt=""> @endif <input type="file" id="file"> @endif
@if($userImgStatus == 1) <img src="{{ $userImg }}" 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 == 2) <img src="{{ asset('postcard/images/sh_fail.jpg') }}" class="img img-sh" alt=""> @if($userImgStatus == 1) <img src="{{ $userImg }}" class="img img-sh" alt=""> @endif
<input type="file" id="file"> @endif @if($userImgStatus == 2) <img src="{{ asset('postcard/images/sh_fail.jpg') }}" class="img img-sh" alt="">
<input type="file" id="file"> @endif
</div>
@if($userImgStatus != 1)
<span>建议尺寸(710*414px)</span>
@endif
</div> </div>
<div class="bottom-container"> <div class="bottom-container">
<!--分享--> <!--分享-->
...@@ -200,6 +206,7 @@ ...@@ -200,6 +206,7 @@
$(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');
...@@ -227,7 +234,7 @@ ...@@ -227,7 +234,7 @@
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
$('.img-add').hide(); $('.img-add').hide();
$('.ggsk-container').html('<img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt="">'); $('.img-container').html('<img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt="">');
}, },
error: function (data) { error: function (data) {
......
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