Skip to content

T
taobao-mini-template
Commit c3a032e8 authored by 王波's avatar 王波
Browse files
Options

Merge branch 'b_template_component_bugfixed_20210714' into 'b-template-component' 

B template component bugfixed 20210714

See merge request !33
parents 9ef2bccb 8e7495e7
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 2 deletions
client/components/dialog/rank-dialog/rank-dialog.js
View file @ c3a032e8
...@@ -44,7 +44,15 @@ Component({ ...@@ -44,7 +44,15 @@ Component({
if ( if (
<% for(var i = 0; i < winnersFilterData.length; ++i) {%> <% for(var i = 0; i < winnersFilterData.length; ++i) {%>
<%- `${winnersFilterData[i] == 'timeRange' ? `!${winnersFilterData[i]}.length` : `!${winnersFilterData[i]}`} ${i === winnersFilterData.length - 1 ? '' : '&&'}` %> <%- `${winnersFilterData[i] == 'timeRange' ?
`!${winnersFilterData[i]}.length` :
`${((winnersFilterData[i] == 'prizeType' || winnersFilterData[i] == 'shipStatus' || winnersFilterData[i] == 'prizeDataType') ?
`${winnersFilterData[i]} == null` :
`!${winnersFilterData[i]}`
)}`
}
${i === winnersFilterData.length - 1 ? '' : ' &&'}`
%>
<% } %> <% } %>
) { ) {
this.resetData(); this.resetData();
...@@ -146,7 +154,15 @@ Component({ ...@@ -146,7 +154,15 @@ Component({
if ( if (
<% for(var i = 0; i < winnersFilterData.length; ++i) {%> <% for(var i = 0; i < winnersFilterData.length; ++i) {%>
<%- `${winnersFilterData[i] == 'timeRange' ? `!${winnersFilterData[i]}.length` : `!${winnersFilterData[i]}`} ${i === winnersFilterData.length - 1 ? '' : '&&'}` %> <%- `${winnersFilterData[i] == 'timeRange' ?
`!${winnersFilterData[i]}.length` :
`${((winnersFilterData[i] == 'prizeType' || winnersFilterData[i] == 'shipStatus' || winnersFilterData[i] == 'prizeDataType') ?
`${winnersFilterData[i]} == null` :
`!${winnersFilterData[i]}`
)}`
}
${i === winnersFilterData.length - 1 ? '' : ' &&'}`
%>
<% } %> <% } %>
) { ) {
this.resetData(); this.resetData();
......
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