generated from root/miduo_server
Merge branch 'jieling' of http://60.1.1.230/backend/gm_tw_admin into jieling
# Conflicts: # conf/jsonconf/RechargeCommodityConfig.txt
commit
29c10fac41
|
@ -125,6 +125,12 @@
|
|||
1560 石匙·四
|
||||
1561 商人的货物
|
||||
1562 深渊之骨
|
||||
1563 誓约胜利之剑
|
||||
1564 药药
|
||||
1565 神台钥匙
|
||||
1566 巢穴密令
|
||||
1567 巢穴残骸
|
||||
1568 龙宫秘钥
|
||||
10001 蚩尤
|
||||
10002 白素贞
|
||||
10003 猪八戒
|
||||
|
@ -499,6 +505,7 @@
|
|||
73026 青阳先知
|
||||
73041 发条迷城
|
||||
73033 瑞气春来
|
||||
74026 魔心帝君
|
||||
90001 风雷翅
|
||||
90002 镇海石
|
||||
90003 雄黄宝剑
|
||||
|
@ -748,6 +755,8 @@
|
|||
30041 发条迷城7天
|
||||
13033 瑞气春来
|
||||
30033 瑞气春来7天
|
||||
14026 魔心帝君
|
||||
31026 魔心帝君7天
|
||||
1206 罗浮争锋挑战次数
|
||||
1207 罗浮晶石
|
||||
1208 降神诏
|
||||
|
@ -820,3 +829,7 @@
|
|||
81185 极品神将自选箱
|
||||
104 天地盘
|
||||
105 玲珑宝镜开门
|
||||
1227 九元露
|
||||
80015 跨服冠军称号
|
||||
80016 跨服亚军称号
|
||||
80017 跨服季军称号
|
||||
|
|
|
@ -221,7 +221,6 @@ public class MailController {
|
|||
mail.setState(2);
|
||||
mail.setAuditUser(userName);
|
||||
mail.setAuditTime(DateUtil.nowString());
|
||||
mailDao.updateMail(mail);
|
||||
|
||||
// 全服邮件
|
||||
if (mail.getType() == SERVER_MAIL){
|
||||
|
@ -240,6 +239,7 @@ public class MailController {
|
|||
mailDao.sendPersonalMail(mail);
|
||||
}
|
||||
|
||||
mailDao.updateMail(mail);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -58,10 +58,7 @@
|
|||
对应服务器:</label>
|
||||
<div class="formControls col-xs-8 col-sm-9">
|
||||
<!--<input type="hidden" id="serverInfoInput"/>-->
|
||||
<select name="serverInfo" class="input-text" id="serverInfo"><!--下拉列表-->
|
||||
<option value="0" selected="selected">正式服</option>
|
||||
<option value="1" >提审服</option>
|
||||
</select>
|
||||
<input type="text" id="serverInfo" name="serverInfo" style="width: 100px;" placeholder="只能输入数字" class="input-text"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -114,9 +111,7 @@
|
|||
function addTishenInfo() {
|
||||
var erroCode = $('.ERRINFO');
|
||||
var _id = $("input[name='_id']").val();
|
||||
// var serverInfo = $("#serverInfoInput").val();
|
||||
var serverInfo = document.getElementById("serverInfo").value;
|
||||
|
||||
var serverInfo = $("input[name='serverInfo']").val();
|
||||
var remark = $("input[name='remark']").val();
|
||||
|
||||
if (_id === '' || _id == null) {
|
||||
|
@ -130,7 +125,7 @@
|
|||
JSON.stringify({
|
||||
"_id": _id,
|
||||
"remark":remark,
|
||||
"serverInfo": serverInfo,
|
||||
"serverInfo": serverInfo
|
||||
})
|
||||
,
|
||||
url: "/addTishenServer",
|
||||
|
|
|
@ -50,10 +50,7 @@
|
|||
<tr th:each="obj:${handInInfos}">
|
||||
<!--<td><input type="checkbox" value="" name=""/></td>-->
|
||||
<td th:text="${obj._id}" style="text-align: center;"></td>
|
||||
<td th:switch="${obj.serverInfo}" style="text-align: center;">
|
||||
<span th:case=0> 正式服</span>
|
||||
<span th:case=1> 提审服</span>
|
||||
</td>
|
||||
<td th:text="${obj.serverInfo}" style="text-align: center;"></td>
|
||||
<td th:text="${obj.remark}" style="text-align: center;"></td>
|
||||
|
||||
<td style="text-align: center; width: 300px">
|
||||
|
|
|
@ -58,10 +58,7 @@
|
|||
对应服务器:</label>
|
||||
<div class="formControls col-xs-8 col-sm-9">
|
||||
<!--<input type="hidden" id="serverInfoInput"/>-->
|
||||
<select name="serverInfo" class="input-text" id="serverInfo" th:value="*{serverInfo}"><!--下拉列表-->
|
||||
<option value="0" th:selected="*{serverInfo eq 0}">正式服</option>
|
||||
<option value="1" th:selected="*{serverInfo eq 1}">提审服</option>
|
||||
</select>
|
||||
<input type="text" id="serverInfo" name="serverInfo" placeholder="" th:value="*{serverInfo}" class="input-text" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in New Issue