Commit f632512a authored by yangshuxing's avatar yangshuxing

bug优化

parent 2e7082a7
...@@ -94,10 +94,13 @@ ...@@ -94,10 +94,13 @@
</update> </update>
<select id="queryUserCmptList" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptVo"> <select id="queryUserCmptList" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptVo">
select a.id,a.cmpt_id cmptId,b.cmpt_name name, b.logo cmptLogo,b.bg_color cmptbgColor,a.mark_no markNo select a.id,a.cmpt_id cmptId,b.cmpt_name name,
from gk_user_cmpt_map a b.logo cmptLogo,b.bg_color cmptbgColor,a.mark_no markNo
left join gk_cmpt b on a.cmpt_id = b.cmpt_id from gksite.gk_user_cmpt_map a
where a.user_id = #{userId} and status = 1 left join gksite.gk_cmpt b on a.cmpt_id = b.cmpt_id
left join common.neucmpt c on b.cmpt_id=c.gtCmptId
left join raceenroll.competition d on c.gCmptId=d.cmptId
where a.user_id = #{userId} and status = 1 order by d.openTime desc
</select> </select>
<select id="countCount" resultType="long"> <select id="countCount" resultType="long">
...@@ -124,7 +127,7 @@ ...@@ -124,7 +127,7 @@
left join raceenroll.competition c on b.gcmptid=c.cmptid left join raceenroll.competition c on b.gcmptid=c.cmptid
where a.del_flag=0 where a.del_flag=0
<include refid="cmpt-where-sql"/> <include refid="cmpt-where-sql"/>
order by a.create_date desc order by c.startTime desc
limit #{page.offset},#{page.size} limit #{page.offset},#{page.size}
</select> </select>
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
switch_news=#{setting.news}, switch_news=#{setting.news},
</if> </if>
<if test="setting.banner != null"> <if test="setting.banner != null">
switch_banner=#{setting.banner} switch_banner=#{setting.banner},
</if> </if>
<if test="setting.newsAlias != null"> <if test="setting.newsAlias != null">
news_alias=#{setting.newsAlias} news_alias=#{setting.newsAlias},
</if> </if>
<if test="setting.mileage != null"> <if test="setting.mileage != null">
switch_mileage=#{setting.mileage} switch_mileage=#{setting.mileage},
</if> </if>
<if test="setting.switchScoreReview != null"> <if test="setting.switchScoreReview != null">
switch_scoreReview=#{setting.switchScoreReview} switch_scoreReview=#{setting.switchScoreReview}
......
...@@ -109,16 +109,18 @@ ...@@ -109,16 +109,18 @@
data : customerV.$data.customer, data : customerV.$data.customer,
type:'post', type:'post',
beforeSend:function(){ beforeSend:function(){
layer.load() var index = layer.load()
setTimeout(function () {
layer.close(index);
},1500)
}, },
success:function (data) { success:function (data) {
customerV.$data.customer = data.content; customerV.$data.customer = data.content;
layer.msg('保存成功!') layer.msg('保存成功!')
}, setTimeout(function () {
complete:function () { layer.closeAll();
layer.closeAll(); },1000)
} }
}) })
} }
} }
......
...@@ -68,12 +68,10 @@ var score = new Vue({ ...@@ -68,12 +68,10 @@ var score = new Vue({
changeRoad:function () { changeRoad:function () {
console.log(score.$data.selectedRoadId) console.log(score.$data.selectedRoadId)
reviewPage.reloadPage(); reviewPage.reloadPage();
reviewPage.getStatistic();
}, },
changeRule:function () { changeRule:function () {
console.log(score.$data.selectedRuleId); console.log(score.$data.selectedRuleId);
reviewPage.reloadPage(); reviewPage.reloadPage();
reviewPage.getStatistic();
}, },
next:function () { next:function () {
if((score.$data.param.page+2) > Math.ceil(score.$data.totalPage/10)){ if((score.$data.param.page+2) > Math.ceil(score.$data.totalPage/10)){
...@@ -133,7 +131,6 @@ var reviewPage = { ...@@ -133,7 +131,6 @@ var reviewPage = {
score.$data.rules = data.content; score.$data.rules = data.content;
score.$data.selectedRuleId = score.$data.rules[0].id; score.$data.selectedRuleId = score.$data.rules[0].id;
reviewPage.reloadPage(); reviewPage.reloadPage();
reviewPage.getStatistic();
} }
} }
}); });
...@@ -157,6 +154,7 @@ var reviewPage = { ...@@ -157,6 +154,7 @@ var reviewPage = {
} else if(score.$data.param.checkstatus == 2){ } else if(score.$data.param.checkstatus == 2){
score.$data.reviewCount.nopass = data.total; score.$data.reviewCount.nopass = data.total;
} }
reviewPage.getStatistic();
}, },
complete:function () { complete:function () {
layer.closeAll(); layer.closeAll();
......
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