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

This commit is contained in:
aixianling
2022-03-18 18:27:40 +08:00

View File

@@ -1,13 +1,14 @@
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="searAreName"> <div class="searAreName">
<AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect"> <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect" >
<div class="ai-area__wrapper"> <div class="ai-area__wrapper">
<span class="label" v-if="areaName">{{ areaName }}</span> <span class="label" v-if="areaName">{{ areaName }}</span>
<span v-else>请选择</span> <span v-else>请选择</span>
<u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon> <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
</div> </div>
</AiAreaPicker> </AiAreaPicker>
<!-- <span v-else>{{ areaName }}</span> -->
<u-search v-model="name" ref="searchObj" placeholder="请输入名称/类型/电话" :show-action="false" clearabled bg-color="#F5F5F5" search-icon-color="#ccc" placeholder-color="#666" @search="handerSearch" @clear=";(index = []), (name = ''), getList()" style="width: 70%" /> <u-search v-model="name" ref="searchObj" placeholder="请输入名称/类型/电话" :show-action="false" clearabled bg-color="#F5F5F5" search-icon-color="#ccc" placeholder-color="#666" @search="handerSearch" @clear=";(index = []), (name = ''), getList()" style="width: 70%" />
</div> </div>
@@ -94,7 +95,7 @@ export default {
this.current = 0 this.current = 0
this.list = [] this.list = []
} else { } else {
this.areaId = this.$areaId return false
} }
this.$nextTick(() => { this.$nextTick(() => {
this.getList() this.getList()