diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js index 8885541..aef7a6e 100644 --- a/components/searchSelect/index.js +++ b/components/searchSelect/index.js @@ -109,7 +109,7 @@ Component({ return } this.setData({ - columns: parks?.map(item => `${item.meterNo}-${item.address}${item.tenement?.name ? '-' + item.tenement?.name : ''}`), + columns: parks?.map(item => `${item.meterNo}-${item.address}${item.shortName ? '-' + item.shortName : ''}`), list: parks, }) } diff --git a/components/searchSelect/index.wxss b/components/searchSelect/index.wxss index a6bad63..540bed4 100644 --- a/components/searchSelect/index.wxss +++ b/components/searchSelect/index.wxss @@ -1 +1,3 @@ -/* components/searchSelect/index.wxss */ \ No newline at end of file +/* components/searchSelect/index.wxss */ +.van-ellipsis van-picker-column__item { +} \ No newline at end of file diff --git a/pages/workBench/components/approve/index.js b/pages/workBench/components/approve/index.js index dd00b16..6fbd81c 100644 --- a/pages/workBench/components/approve/index.js +++ b/pages/workBench/components/approve/index.js @@ -14,7 +14,7 @@ Component({ properties: { }, - + /** * 组件的初始数据 */ @@ -23,7 +23,11 @@ Component({ keywordTemp: "", page: 1, }, - + lifetimes: { + attached() { + this.init(); + } + }, /** * 组件的方法列表 */ diff --git a/pages/workBench/components/approve/index.wxml b/pages/workBench/components/approve/index.wxml index f2dd0c0..219b909 100644 --- a/pages/workBench/components/approve/index.wxml +++ b/pages/workBench/components/approve/index.wxml @@ -14,82 +14,80 @@ - - - - - 搜索 - - - - - - - - - 商户名字 - 充值金额 - 操作 - - - - - - - - - {{ item.tenement.shortName }} - {{ item.money }} - - - 查看详细 - + + + 搜索 + + + + + + + + + 商户名字 + 充值金额 + 操作 + + + + + + + + + {{ item.tenement.shortName }} + {{ item.money }} + + + 查看详细 - - - + + + - - - - - - - 同意 - 拒绝 - + + + + + + + + 同意 + 拒绝 +