|
|
@@ -13,6 +13,7 @@
|
|
|
<%@ page import="java.util.List" %>
|
|
|
<%@ page import="org.apache.commons.lang.StringUtils" %>
|
|
|
<%@ page import="org.jooq.Record" %>
|
|
|
+<%@ page import="java.sql.Timestamp" %>
|
|
|
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
|
|
|
<%
|
|
|
int activitypk = JspUtils.getInt(request, session, "activitypk");
|
|
|
@@ -32,13 +33,19 @@
|
|
|
.and(GIFT_RECORD.ACTIVITYPK.equal(activitypk))
|
|
|
.and(GIFT_RECORD.ACCFLAG.equal(9))
|
|
|
.asField("gift");
|
|
|
- Result list = ctx.select(PARTTYSIGN.PK, PARTTYSIGN.PIC, MEMBERINFO.PET, MODELINFO.PK.as("modelpk"), gift)
|
|
|
+ Field<Object> lastGift = ctx.select(DSL.ifnull(DSL.max(GIFT_RECORD.DATE), Timestamp.valueOf("1970-01-01 00:00:00")))
|
|
|
+ .from(GIFT_RECORD)
|
|
|
+ .where(GIFT_RECORD.MODELPK.equal(MODELINFO.PK))
|
|
|
+ .and(GIFT_RECORD.ACTIVITYPK.equal(activitypk))
|
|
|
+ .and(GIFT_RECORD.ACCFLAG.equal(9))
|
|
|
+ .asField("lastGift");
|
|
|
+ Result list = ctx.select(PARTTYSIGN.PK, PARTTYSIGN.PIC, MEMBERINFO.PET, MODELINFO.PK.as("modelpk"), gift, lastGift)
|
|
|
.from(PARTTYSIGN)
|
|
|
.join(MEMBERINFO).on(PARTTYSIGN.MEMBERPK.equal(MEMBERINFO.PK))
|
|
|
.join(MODELINFO).on(MODELINFO.MEMBERPK.equal(PARTTYSIGN.MEMBERPK))
|
|
|
.where(PARTTYSIGN.PARTTYPK.equal(activitypk))
|
|
|
.and(PARTTYSIGN.PASS.equal(1))
|
|
|
- .orderBy(PARTTYSIGN.PK.desc())
|
|
|
+ .orderBy(lastGift.desc(), PARTTYSIGN.PK.desc())
|
|
|
.limit(20 * (pageIndex - 1), 20)
|
|
|
.fetch();
|
|
|
JspUtils.writeJson(response, DBRecordsPack.Pack(list));
|
|
|
@@ -70,7 +77,6 @@
|
|
|
modelpk = record1.get(MODELINFO.PK);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
ctx.close();
|
|
|
%>
|
|
|
<html>
|
|
|
@@ -220,7 +226,7 @@
|
|
|
border-radius: 20px 20px 0 0;
|
|
|
background: rgba(255, 255, 255, 1);
|
|
|
transform: translateY(-20px);
|
|
|
- padding: 20px 20px 60px 20px;
|
|
|
+ padding: 20px 20px 90px 20px;
|
|
|
}
|
|
|
|
|
|
.mainTitle {
|
|
|
@@ -241,7 +247,7 @@
|
|
|
.ranking {
|
|
|
position: fixed;
|
|
|
right: 14px;
|
|
|
- bottom: 5px;
|
|
|
+ bottom: 60px;
|
|
|
width: 56px;
|
|
|
z-index: 50;
|
|
|
}
|
|
|
@@ -276,12 +282,13 @@
|
|
|
<template>
|
|
|
<div class="content-top">
|
|
|
<div class="message">
|
|
|
- <img src="${pageContext.request.contextPath}/image/dancer/img_wuwang.png" alt="">
|
|
|
- <div class="text">
|
|
|
- {{time}}
|
|
|
+ <img src="${pageContext.request.contextPath}/image/dancer/img_wuwang.png" alt=""
|
|
|
+ style="width: 202px;height: 33px;margin-top: 16px">
|
|
|
+ <div class="text" style="margin-top: 7px">
|
|
|
+ 2018.12.17-2018.12.30
|
|
|
</div>
|
|
|
<div class="text">
|
|
|
- {{message}}
|
|
|
+ 谁是舞王模特大赛
|
|
|
</div>
|
|
|
<a href="activityDetail.jsp" class="btn">
|
|
|
查看详情
|
|
|
@@ -338,10 +345,9 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<a href="rankingList.jsp?activitypk=<%=activitypk%>&memberpk=<%=memberpk%>">
|
|
|
- <img src="${pageContext.request.contextPath}/image/dancer/icon_paihang.png" class="ranking" alt=""
|
|
|
- :style="{bottom: isModel ? '60px' : '5px'}">
|
|
|
+ <img src="${pageContext.request.contextPath}/image/dancer/icon_paihang.png" class="ranking" alt="">
|
|
|
</a>
|
|
|
- <div class="btn-apply" v-if="isModel" @click="signUp" :class="btnClass">{{btnText}}</div>
|
|
|
+ <div class="btn-apply" @click="signUp" :class="btnClass">{{btnText}}</div>
|
|
|
</template>
|
|
|
</div>
|
|
|
|
|
|
@@ -355,8 +361,6 @@
|
|
|
el: '#app',
|
|
|
data() {
|
|
|
return {
|
|
|
- time: " 2018.12.17-2018.12.30",
|
|
|
- message: "谁是舞王模特大赛",
|
|
|
ads: <%=ads%>,
|
|
|
swiperOption: {
|
|
|
autoplay: true,
|
|
|
@@ -376,6 +380,7 @@
|
|
|
joinFlag: true,
|
|
|
notFlag: true,
|
|
|
isModel: /chmoModel/i.test(navigator.userAgent),
|
|
|
+ iOS: /iPhone/i.test(navigator.userAgent),
|
|
|
signState: <%=signState%>,
|
|
|
modelpk: ''
|
|
|
}
|
|
|
@@ -420,9 +425,6 @@
|
|
|
if (!this.joinFlag) {
|
|
|
return
|
|
|
}
|
|
|
- if (this.currentPage == 1) {
|
|
|
- this.joinList = []
|
|
|
- }
|
|
|
$.get({
|
|
|
url: '',
|
|
|
data: {
|
|
|
@@ -436,6 +438,9 @@
|
|
|
if (res.length == 0) {
|
|
|
this.joinFlag = false
|
|
|
}
|
|
|
+ if (this.currentPage == 1) {
|
|
|
+ this.joinList = []
|
|
|
+ }
|
|
|
this.joinList = this.joinList.concat(res)
|
|
|
}.bind(this)
|
|
|
})
|
|
|
@@ -460,7 +465,7 @@
|
|
|
activitypk: <%=activitypk%>
|
|
|
})
|
|
|
} catch (e) {
|
|
|
- console.log(e)
|
|
|
+ window.location.href = 'https://itunes.apple.com/cn/app/id1434011196?mt=8'
|
|
|
}
|
|
|
} else if (this.signState === 1) {
|
|
|
if ('<%=modelpk%>' > 0) {
|