diff --git a/template/listOperations/listOperations.js b/template/listOperations/listOperations.js index 57b6ac6..3d6fc0b 100644 --- a/template/listOperations/listOperations.js +++ b/template/listOperations/listOperations.js @@ -526,6 +526,7 @@ Component({ let obj = this.data.conditionObj if (!obj['orderby']) return obj['orderby'].show = data + obj['moreCondition'].show = data // if(obj['orderby'].show) // obj. this.setData({ diff --git a/template/listOperations/listOperations.wxml b/template/listOperations/listOperations.wxml index 7c571d6..48af435 100644 --- a/template/listOperations/listOperations.wxml +++ b/template/listOperations/listOperations.wxml @@ -16,7 +16,12 @@ +<<<<<<< HEAD +======= + + +>>>>>>> 71b7e23abfa258e9cead5065ea17bfa13d54711e