记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 185368b6 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/master' into jxl_1029_admin_refund 

# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html
parents 375a9bb3 3086b75c
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 2 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html
View file @ 185368b6
...@@ -2,6 +2,110 @@ ...@@ -2,6 +2,110 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<th:block th:include="include :: header('退款详情')"/> <th:block th:include="include :: header('退款详情')"/>
<style>
.showPhotoModal {
display: none;
height: 450px;
width: 640px;
z-index: 999;
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin: 10% auto;
background: #fff;
box-shadow: rgba(0, 0, 0, 0.3) 1px 1px 50px;
}
.showPhotoModal .top{
height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #ccc;
}
.showPhotoModal .top .title{
padding-left: 12px;
font-size: 16px;
}
.showPhotoModal .top .close{
padding-right: 12px;
font-size: 16px;
color: black;
}
.showPhotoModal .content {
height: 360px;
width: 100%;
border-bottom: 1px solid #ccc;
display: flex;
justify-content: center;
align-items: center;
}
.showPhotoModal .content img{
max-height: 360px;
/* width: 100%; */
}
.showPhotoModal .bottom {
height: 50px;
display: flex;
flex-direction: row-reverse;
align-items: center;
}
.showPhotoModal .bottom {
display: flex;
flex-direction: row-reverse;
align-items: center;
}
.showPhotoModal .bottom div span {
cursor: pointer;
font-size: 12px;
font-weight: normal;
margin: 0px 7px;
padding: 0px 15px;
color: rgb(255, 255, 255);
border: 1px solid rgb(0, 100, 182);
background: no-repeat rgb(0, 113, 206);
border-radius: 3px;
display: inline-block;
height: 30px;
line-height: 30px;
text-align: center;
vertical-align: middle;
text-decoration: none;
outline: none;
box-sizing: content-box;
}
.showPhotoModal .bottom div span:last-child {
font-size: 12px;
font-weight: normal;
margin: 0px 7px;
padding: 0px 15px;
color: black;
border: 1px solid #bbb;
background: no-repeat #fff;
border-radius: 3px;
display: inline-block;
height: 30px;
line-height: 30px;
text-align: center;
vertical-align: middle;
text-decoration: none;
outline: none;
box-sizing: content-box;
}
.modals {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index: 888;
display: none;
overflow: hidden;
background-color: rgb(0, 0, 0);
opacity: 0.3;
}
</style>
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
...@@ -77,7 +181,7 @@ ...@@ -77,7 +181,7 @@
<tbody> <tbody>
<tr> <tr>
<td th:each="str : ${KylinOrderRefundsAdminVo.picList}" style="float: left"> <td th:each="str : ${KylinOrderRefundsAdminVo.picList}" style="float: left">
<img th:src="${str}" width="25%"> <img th:src="${str}" onclick="showPic(this)" width="25%">
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -109,8 +213,45 @@ ...@@ -109,8 +213,45 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<a id="downLoadImg" href="" download style="display: none;"></a>
<div class="modals"></div>
<div class="showPhotoModal">
<div class="top">
<div class="title">
图片展示
</div>
<div class="close" onclick="closeModal()">
x
</div>
</div>
<div class="content">
<img id="showPhoto" src="" alt="">
</div>
<div class="bottom">
<div>
<span onclick="downloadImg()">下载</span>
<span onclick="closeModal()">关闭</span>
</div>
</div>
</div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
</body> </body>
<script>
function showPic(e) {
$(".showPhotoModal").show();
$(".modals").show();
$("#showPhoto").attr('src', $(e).attr('src'));
};
function downloadImg() {
$("#downLoadImg").attr('href', $("#showPhoto").attr('src')+'?response-content-type=application/octet-stream');
$("#downLoadImg")[0].click();
closeModal();
};
function closeModal() {
$(".showPhotoModal").hide();
$(".modals").hide();
};
</script>
</html> </html>
liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-k8s-test.yml
View file @ 185368b6
...@@ -38,7 +38,7 @@ eureka: ...@@ -38,7 +38,7 @@ eureka:
register-with-eureka: true #禁止自己当做服务注册 register-with-eureka: true #禁止自己当做服务注册
fetch-registry: true #屏蔽注册信息 fetch-registry: true #屏蔽注册信息
serviceUrl: serviceUrl:
defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@eureka-test-0.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@eureka-test-1.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@eureka-test-2.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@eureka-test-0.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka
# instance: # instance:
# prefer-ip-address: true # prefer-ip-address: true
# instance-id: ${spring.application.name}:${server.port} # instance-id: ${spring.application.name}:${server.port}
......
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