|
|
@@ -70,13 +70,13 @@
|
|
|
List<JSONObject> gifts = DBRecordsPack.Pack(result);
|
|
|
pageContext.setAttribute("gifts", gifts);
|
|
|
|
|
|
- Field<Object> gift = ctx.select(DSL.sum(GIFT_RECORD.COIN))
|
|
|
+ Field<Object> gift = ctx.select(DSL.ifnull(DSL.sum(GIFT_RECORD.COIN), 0))
|
|
|
.from(GIFT_RECORD)
|
|
|
.where(GIFT_RECORD.MODELPK.equal(MODELINFO.PK))
|
|
|
.and(GIFT_RECORD.ACTIVITYPK.equal(activitypk))
|
|
|
.and(GIFT_RECORD.ACCFLAG.equal(9))
|
|
|
.asField("gift");
|
|
|
- Result more = ctx.select(PARTTYSIGN.PK, PARTTYSIGN.PIC, MEMBERINFO.PET, gift)
|
|
|
+ Result more = ctx.select(PARTTYSIGN.PK, PARTTYSIGN.PIC, MEMBERINFO.PET, MODELINFO.PK.as("modelpk"), gift)
|
|
|
.from(PARTTYSIGN)
|
|
|
.join(MEMBERINFO).on(PARTTYSIGN.MEMBERPK.equal(MEMBERINFO.PK))
|
|
|
.join(MODELINFO).on(MODELINFO.MEMBERPK.equal(PARTTYSIGN.MEMBERPK))
|
|
|
@@ -122,6 +122,14 @@
|
|
|
-moz-osx-font-smoothing: grayscale;
|
|
|
}
|
|
|
|
|
|
+ a {
|
|
|
+ text-decoration: none;
|
|
|
+ }
|
|
|
+
|
|
|
+ a:visited {
|
|
|
+ text-decoration: none;
|
|
|
+ }
|
|
|
+
|
|
|
.swiper-pagination-bullet {
|
|
|
width: 6px;
|
|
|
height: 1px;
|
|
|
@@ -443,6 +451,7 @@
|
|
|
box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.08);
|
|
|
border-radius: 6px;
|
|
|
overflow: hidden;
|
|
|
+ display: block;
|
|
|
}
|
|
|
|
|
|
.more-item .cover {
|
|
|
@@ -583,16 +592,17 @@
|
|
|
<div style="font-size: 0;padding: 0 10px;">
|
|
|
<c:forEach var="item" items="${moreList}">
|
|
|
<div class="more-item-wrapper">
|
|
|
- <div class="more-item">
|
|
|
+ <a class="more-item"
|
|
|
+ href="${pageContext.request.contextPath}${pageContext.request.servletPath}?modelpk=${item.modelpk}&memberpk=<%=memberpk%>&activitypk=<%=activitypk%>">
|
|
|
<div class="cover"
|
|
|
style="background-image: url('${pageContext.request.contextPath}/${item.pic}')">
|
|
|
<div class="info">${item.PK}号-${item.gift}礼物</div>
|
|
|
</div>
|
|
|
<div class="name">${item.Pet}
|
|
|
- <div class="gift"><img src="${pageContext.request.contextPath}/image/icon_gift.png">礼物
|
|
|
+ <div class="gift"><img src="${pageContext.request.contextPath}/image/icon_gift_small.png">礼物
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </a>
|
|
|
</div>
|
|
|
</c:forEach>
|
|
|
</div>
|
|
|
@@ -602,7 +612,7 @@
|
|
|
<img src="${pageContext.request.contextPath}/image/icon_video.png">视频
|
|
|
</div>
|
|
|
<div class="btn-gift">
|
|
|
- <img src="${pageContext.request.contextPath}/image/icon_gift_small.png">礼物
|
|
|
+ <img src="${pageContext.request.contextPath}/image/icon_gift.png">礼物
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|