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

Commit 5d0794fd authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/master_zhouhuan' into pre

parents 185368b6 5cd5c22b
...@@ -78,6 +78,25 @@ ...@@ -78,6 +78,25 @@
position: absolute; position: absolute;
} }
.notice{
width: 50px;
height: 50px;
margin-left: 10px;
background-color: #9b9b9b;
}
.imgwid{
/*width: 100%;*/
padding: 0 20px;
/*border: #9b9b9b solid 2px;*/
overflow: auto;
height: 650px;
}
.imgwid img{
width: 100%;
}
.ibox { .ibox {
margin-bottom: 25px; margin-bottom: 25px;
background-color: #fff; background-color: #fff;
......
...@@ -5,8 +5,12 @@ ...@@ -5,8 +5,12 @@
</head> </head>
<style> <style>
.img-details{ .img-details{
width: 30%; width: 300px;
height: 40%; height: 400px;
}
.img-Approval{
width-max:300px;
height: 400px;
} }
</style> </style>
...@@ -63,138 +67,142 @@ ...@@ -63,138 +67,142 @@
<form class="form-horizontal m" id="form-performances-edit" <form class="form-horizontal m" id="form-performances-edit"
th:object="${kylinPerformanceMisVo}"> th:object="${kylinPerformanceMisVo}">
<div> <div>
<p>演出封面:</p> <h4>演出封面:</h4>
<img class="img-details" name="img" th:src="*{imgPoster}" th:onclick="click_big([[*{imgPoster}]])"> <img class="img-details" name="img" th:src="*{imgPoster}" th:onclick="click_big([[*{imgPoster}]])">
</div> </div>
<div> </br>
<div class="panel panel-info">
<div class="panel-heading">
<label>演出名称:</label> <label>演出名称:</label>
<span th:text="*{title}"></span> <span th:text="*{title}"></span>
</div> </div>
<div> <div class="panel-footer">
<label>是否实名:</label> <label>是否实名:</label>
<span th:if="*{isTrueName==1}"></span> <span th:if="*{isTrueName==1}"></span>
<span th:if="*{isTrueName==0}"></span> <span th:if="*{isTrueName==0}"></span>
</div> </div>
<div> <div class="panel-footer">
<label>时间:</label> <label>时间:</label>
<span th:text="*{timeStart}"></span> <span th:text="*{timeStart}"></span>
<span> - </span> <span> - </span>
<span th:text="*{timeEnd}"></span> <span th:text="*{timeEnd}"></span>
</div> </div>
<div> <div class="panel-footer">
<label>演出类型:</label> <label>演出类型:</label>
<span th:if="*{type==101}">音乐节</span> <span th:if="*{type==101}">音乐节</span>
<span th:if="*{type==102}">小型演出</span> <span th:if="*{type==102}">小型演出</span>
<span th:if="*{type==103}">巡演</span> <span th:if="*{type==103}">巡演</span>
</div> </div>
<div> <div class="panel-footer">
<label>场地:</label> <label>场地:</label>
<span th:text="*{fieldName}"></span> <span th:text="*{fieldName}"></span>
</div> </div>
<div> <div class="panel-footer">
<label>价格:</label> <label>价格:</label>
<span th:text="*{price}"></span> <span th:text="*{price}"></span>
</div> </div>
<div> <div class="panel-footer">
<label>停售时间:</label> <label>停售时间:</label>
<span th:text="*{stopSellTime}"></span> <span th:text="*{stopSellTime}"></span>
</div> </div>
<div> <div class="panel-footer">
<label>主办方:</label> <label>主办方:</label>
<span th:text="*{sponsor}"></span> <span th:text="*{sponsor}"></span>
</div>
<div> <div>
<label>联系人:</label> <label>联系人:</label>
<span th:text="*{contacts}"></span> <span th:text="*{contacts}"></span>
</div> <label style="margin-left: 15px; padding-left: 15px; border-left: #1a2226 solid 1px">联系电话:</label>
<div>
<label>联系电话:</label>
<span th:text="*{mobile}"></span> <span th:text="*{mobile}"></span>
</div> </div>
</div>
</div>
<div> <div>
<p>演出批文:</p> <h4>演出批文:</h4>
<img class="img-details" name="img" th:src="*{approvalUrl}" th:onclick="click_big([[*{approvalUrl}]])"> <img class="img-Approval" name="img" th:src="*{approvalUrl}" th:onclick="click_big([[*{approvalUrl}]])">
</div> </div>
</br>
<div class="ibox-content" id="eg"> <h4>演出详情:</h4>
<div class="click2edit wrapper" id="subText"> <div class="ibox float-e-margins" id="eg">
<div class="click2edit wrapper imgwid" id="subText">
</div> </div>
</div> </div>
<div id="noticeImg"> <div id="noticeImg" class="ibox float-e-margins ">
<span>购票须知:</span> <h4 class="ibox-title">购票须知:</h4>
<div th:each="dict : ${kylinPerformanceMisVo.noticeImageList}"> <div class="form-group" th:each="dict : ${kylinPerformanceMisVo.noticeImageList}">
<span th:text="${dict.title}"></span> <div class="col-sm-1 b-r" style="text-align: center">
<img th:src="${dict.imgUrl}"/> <img class="img-circle notice" th:src="${dict.imgUrl}"/>
<span th:text="${dict.message}"></span>
</div> </div>
<div class="col-sm-11">
<h5 th:text="${dict.title}"></h5>
<p th:text="${dict.message}"></p>
</div> </div>
</div>
<div th:each="dict : ${kylinPerformanceMisVo.ticketTimes}"> </div>
<div th:each="dict2 : ${dict.ticket}"> <div th:each="dict : ${kylinPerformanceMisVo.ticketTimes}" >
<br/> <div th:each="dict2 : ${dict.ticket}" class="panel panel-info">
<div> <div class="panel-heading">
<span>票种名称:</span> <span>票种名称:</span>
<span th:text="${dict2.title}"></span> <span th:text="${dict2.title}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>适用日期:</span> <span>适用日期:</span>
<span th:text="${dict2.useStart}"></span> <span th:text="${dict2.useStart}"></span>
<span> - </span> <span> - </span>
<span th:text="${dict2.useEnd}"></span> <span th:text="${dict2.useEnd}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>价格:</span> <span>价格:</span>
<span th:text="${dict2.price}"></span> <span th:text="${dict2.price}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>票种说明:</span> <span>票种说明:</span>
<span th:text="${dict2.describes}"></span> <span th:text="${dict2.describes}"></span>
</div> </div>
<div th:if="${dict2.isElectronic==1}"> <div class="panel-footer" th:if="${dict2.isElectronic==1}">
<span>电子票说明:</span> <span>电子票说明:</span>
<span th:text="${dict2.describeElectronic}"></span> <span th:text="${dict2.describeElectronic}"></span>
</div> </div>
<div th:if="${dict2.isExpress==1}"> <div class="panel-footer" th:if="${dict2.isExpress==1}">
<span>快递票说明:</span> <span>快递票说明:</span>
<span th:text="${dict2.describeExpress}"></span> <span th:text="${dict2.describeExpress}"></span>
</div> </div>
<div th:if="${dict2.limitCount == 0}"> <div class="panel-footer" th:if="${dict2.limitCount == 0}">
<span>限购:</span> <span>限购:</span>
<span>不限购</span> <span>不限购</span>
</div> </div>
<div th:if="${dict2.limitCount != 0}"> <div class="panel-footer" th:if="${dict2.limitCount != 0}">
<span>限购:</span> <span>限购:</span>
<span th:text="${dict2.limitCount}">不限购</span> <span th:text="${dict2.limitCount}">不限购</span>
</div> </div>
<div> <div class="panel-footer">
<span>库存总量:</span> <span>库存总量:</span>
<span th:text="${dict2.totalGeneral}"></span> <span th:text="${dict2.totalGeneral}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>开始售票时间:</span> <span>开始售票时间:</span>
<span th:text="${dict2.timeStart}"></span> <span th:text="${dict2.timeStart}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>是否学生票:</span> <span>是否学生票:</span>
<span th:if="${dict2.isStudent==1}"></span> <span th:if="${dict2.isStudent==1}"></span>
<span th:if="${dict2.isStudent==0}"></span> <span th:if="${dict2.isStudent==0}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>是否显示二维码:</span> <span>是否显示二维码:</span>
<span th:if="${dict2.isShowCode==1}"></span> <span th:if="${dict2.isShowCode==1}"></span>
<span th:if="${dict2.isShowCode==0}"></span> <span th:if="${dict2.isShowCode==0}"></span>
</div> </div>
<div th:if="${dict2.isShowCode==1}"> <div class="panel-footer" th:if="${dict2.isShowCode==1}">
<span>二维码显示时间:</span> <span>二维码显示时间:</span>
<span th:text="${dict2.qrCodeShowTime}"></span> <span th:text="${dict2.qrCodeShowTime}"></span>
</div> </div>
<div> <div class="panel-footer">
<span>取票方式:</span> <span>取票方式:</span>
<span th:if="${dict2.isElectronic==1}">电子票</span> <span th:if="${dict2.isElectronic==1}">电子票</span>
<span th:if="${dict2.isExpress==1}">快递票</span> <span th:if="${dict2.isExpress==1}">快递票</span>
</div> </div>
<div th:if="${dict2.isExpress==1}"> <div class="panel-footer" th:if="${dict2.isExpress==1}">
<span>快递票停售时间:</span> <span>快递票停售时间:</span>
<span th:text="${dict2.timeEndExpress}"></span> <span th:text="${dict2.timeEndExpress}"></span>
</div> </div>
...@@ -258,8 +266,6 @@ ...@@ -258,8 +266,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -357,7 +363,7 @@ ...@@ -357,7 +363,7 @@
// 演出详情 购票须知 // 演出详情 购票须知
var subText = document.getElementById("subText") var subText = document.getElementById("subText")
subText.innerHTML = "演出详情:" + '[[${kylinPerformanceMisVo.details}]]'.replaceAll("\"", ""); subText.innerHTML = '[[${kylinPerformanceMisVo.details}]]'.replaceAll("\"", "");
//会员详情 //会员详情
function memberInfo() { function memberInfo() {
...@@ -402,7 +408,7 @@ ...@@ -402,7 +408,7 @@
var json = { var json = {
"data": [ //相册包含的图片,数组格式 "data": [ //相册包含的图片,数组格式
{ {
"alt": "演出封面", "alt": "图片",
"src": img_url, //原图地址 "src": img_url, //原图地址
} }
] ]
......
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