Commit 47d7251b by huangjinkai

合并

parents b17dbe21 e2a4731e
......@@ -6,14 +6,20 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>回访工单</title>
<!-- Bootstrap 核心 CSS 文件 -->
<link rel="stylesheet" href="./css/bootstrap.min.css">
<link rel="stylesheet" href="./css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css">
<script src="./js/jquery-1.11.2.min.js"></script>
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<!--<script src="./js/vue-2.5.6-min.js"></script>-->
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="./js/index.js"></script>
<script src="./js/bootstrap.min.js"></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script>
</head>
<body>
<!-- 头部 -->
......@@ -34,7 +40,7 @@
<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>备用上传</a>
<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>海外收款</a>-->
<a href="#" class="user-img"><img src="./images/avatar.jpg" alt="">admin</a>
<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>退出</a>
<a href="#" onclick="logout()"><i class="fa fa-upload" aria-hidden="true"></i>退出</a>
</div>
</div>
</div>
......
$(document).ready(function(){
if($.cookie("SESSIONID")){
console.log("logined");
}else{
var ticket = getQueryString("ticket");
if (! ticket) {
window.location.href="http://testcas.yidianling.com/login.html?url="+window.location.href;
}else{
$.ajax({
url:"http://47.97.49.44:8085/validate/ticket/"+ticket,
contentType:"application/json",
xhrFields: {
withCredentials: true
},
async:false,
method:"POST",
crossDomain: true,
success:function(data,status){
if(data.code != 200){
alert(data.msg);
}else{
console.log("success");
window.location.href= removedParameter(window.location.href,"ticket");
}
}});
}
}
});
function removedParameter(url, ref) {
// 如果不包括此参数
if (url.indexOf(ref) == -1)
return url;
var arr_url = url.split('?');
var base = arr_url[0];
var arr_param = arr_url[1].split('&');
var index = -1;
for (i = 0; i < arr_param.length; i++) {
var paired = arr_param[i].split('=');
if (paired[0] == ref) {
index = i;
break;
}
}
if (index == -1) {
return url;
} else {
arr_param.splice(index, 1);
return base + "?" + arr_param.join('&');
}
}
\ No newline at end of file
......@@ -14,6 +14,7 @@ jQuery(document).ready(function ($) {
// 获取工单详情
window.location.href="/woDetail.html?id=" + wo.id;
}
}
})
......@@ -78,7 +79,6 @@ jQuery(document).ready(function ($) {
console.log("用户状态修改成功!");
}
});
}
},
data: {
......
......@@ -169,4 +169,5 @@ jQuery(document).ready(function ($) {
initDetail();
console.log('Finished.');
});
......@@ -10,7 +10,9 @@
<link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css">
<link rel="stylesheet" href="./css/return-order-detail.css">
<script src="./js/jquery.min.js"></script>
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
</head>
<body>
......
......@@ -9,7 +9,9 @@
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css">
<script src="./js/jquery.min.js"></script>
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
</head>
<body>
......
......@@ -10,10 +10,12 @@
<link rel="stylesheet" href="./css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css">
<link rel="stylesheet" href="./css/return-order-detail.css">
<script src="./js/jquery-1.11.2.min.js"></script>
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="./js/sysWoConfig.js"></script>
<script src="./js/bootstrap.min.js" ></script>
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
</head>
<body>
<!-- 头部 -->
......
......@@ -10,7 +10,9 @@
<link rel="stylesheet" href="./css/font-awesome.min.css">
<link rel="stylesheet" href="./css/return-order-index.css">
<link rel="stylesheet" href="./css/return-order-type.css">
<script src="./js/jquery-1.11.2.min.js"></script>
<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="./js/commonfilter.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="./js/woDetail.js"></script>
<script src="./js/bootstrap.min.js"></script>
......
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