Merge branch 'develop' into dev_aliyun

issues25489
p31729568 5 years ago
commit 321cc17811

@ -249,6 +249,7 @@
autoRefresh: true, autoRefresh: true,
smartIndent: true,//智能换行 smartIndent: true,//智能换行
styleActiveLine: true, styleActiveLine: true,
lineWrapping: true,
lint: true, lint: true,
readOnly: "nocursor" readOnly: "nocursor"
}); });

@ -16,7 +16,7 @@
<td class="action-container"> <td class="action-container">
<% if prize_user.leader? && prize_user.competition_prize.category == 'bonus' %> <% if prize_user.leader? && prize_user.competition_prize.category == 'bonus' %>
<% bank_content = [prize_user.extra&.[]('bank'), prize_user.extra&.[]('second_bank'), prize_user.extra&.[]('card_no')].compact.join('<br>').presence || '无' %> <% bank_content = [prize_user.extra&.[]('bank'), prize_user.extra&.[]('second_bank'), prize_user.extra&.[]('card_no')].compact.join('<br>').presence || '无' %>
<%= javascript_void_link('查看银行账户', data: { toggle: 'popover', title: '银行账号', content: bank_content.html_safe, html: true }) %> <%= javascript_void_link('查看银行账户', data: { toggle: 'tooltip', title: bank_content.html_safe, html: true, placement: 'left' }) %>
<% end %> <% end %>
<% if prize_user.pending? %> <% if prize_user.pending? %>

Loading…
Cancel
Save