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

Commit ccffc8df authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

parents 90b65dc2 a883963f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<input type="text" name="mobile" placeholder="请输入手机号码"/> <input type="text" name="mobile" placeholder="请输入手机号码"/>
</li> </li>
<li> <li>
状态 状态1111111
<select name="status" id=""> <select name="status" id="">
<option value="0">全部</option> <option value="0">全部</option>
<option value="1">正常</option> <option value="1">正常</option>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]]; var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]]; var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
var prefix = ctx + "stone/logs"; var prefix = ctx + "stone/logs";
var prefix2 = ctx + "local"; // var prefix2 = ctx + "local";
var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]]; var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]]; var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
} }
// console.log(userIds.toString(), 'dataParam') // console.log(userIds.toString(), 'dataParam')
$.modal.confirm(tipMsg, function() { $.modal.confirm(tipMsg, function() {
$.post('list/export', {uidString: userIds.toString()}, function(result) { $.post(prefix+'/list/export', {uidString: userIds.toString()}, function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
$("button[name=refresh]").click(); $("button[name=refresh]").click();
......
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